[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Fri, 11 Jan 2013 14:47:13 +0000 (15:47 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 11 Jan 2013 14:47:13 +0000 (15:47 +0100)
bzr revid: fva@openerp.com-20130111144713-w8xh4nilg049c834


Trivial merge