[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 17 Dec 2013 16:00:43 +0000 (17:00 +0100)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 17 Dec 2013 16:00:43 +0000 (17:00 +0100)
bzr revid: fva@openerp.com-20131217160043-vsgkwupgvyihj7fg


Trivial merge