[MERGE] Merged with trunk addons
authorThibault Delavallée <tde@openerp.com>
Wed, 11 Jan 2012 12:55:55 +0000 (13:55 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 11 Jan 2012 12:55:55 +0000 (13:55 +0100)
bzr revid: tde@openerp.com-20120111125555-04w1yb6ixiewz4yl


Trivial merge