[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 13 Nov 2012 08:41:53 +0000 (09:41 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 13 Nov 2012 08:41:53 +0000 (09:41 +0100)
bzr revid: tde@openerp.com-20121113084153-8qey53cjvg62a44s


Trivial merge