[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Thu, 27 Feb 2014 14:20:22 +0000 (15:20 +0100)
committerFabien Meghazi <fme@openerp.com>
Thu, 27 Feb 2014 14:20:22 +0000 (15:20 +0100)
bzr revid: fme@openerp.com-20140227142022-fgqnvfzkkqeh99l3


Trivial merge