[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 14 Mar 2013 08:30:48 +0000 (09:30 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 14 Mar 2013 08:30:48 +0000 (09:30 +0100)
bzr revid: tde@openerp.com-20130314083048-fu4gwcsh3z5t7anj


Trivial merge