[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 21 Dec 2012 10:03:20 +0000 (11:03 +0100)
committerThibault Delavallée <tde@openerp.com>
Fri, 21 Dec 2012 10:03:20 +0000 (11:03 +0100)
bzr revid: tde@openerp.com-20121221100320-ntn6zsdcqlvz52xn


Trivial merge