[MERGE] from upstream
authorFrédéric van der Essen <fva@openerp.com>
Tue, 8 Jan 2013 17:52:16 +0000 (18:52 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 8 Jan 2013 17:52:16 +0000 (18:52 +0100)
bzr revid: fva@openerp.com-20130108175216-qsvgflz81jur21vu


Trivial merge