[MERGE] Sync with trunk.
authorGilles Major <gim@openerp.com>
Tue, 12 Mar 2013 09:31:27 +0000 (10:31 +0100)
committerGilles Major <gim@openerp.com>
Tue, 12 Mar 2013 09:31:27 +0000 (10:31 +0100)
bzr revid: tde@openerp.com-20130308141810-f7pfzqgreb9pemba
bzr revid: gim@openerp.com-20130312093127-g3ueh5puatx1m6o2


Trivial merge