[MERGE] upstream
authorFabien Meghazi <fme@openerp.com>
Tue, 25 Feb 2014 10:50:45 +0000 (11:50 +0100)
committerFabien Meghazi <fme@openerp.com>
Tue, 25 Feb 2014 10:50:45 +0000 (11:50 +0100)
bzr revid: fme@openerp.com-20140225105045-9t4a443nq0lw55qu


Trivial merge