[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 29 Nov 2012 11:39:47 +0000 (12:39 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 29 Nov 2012 11:39:47 +0000 (12:39 +0100)
bzr revid: tde@openerp.com-20121129113947-d6113iseluuyh4sl


Trivial merge