[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Thu, 19 Jul 2012 15:29:16 +0000 (17:29 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Thu, 19 Jul 2012 15:29:16 +0000 (17:29 +0200)
bzr revid: fva@openerp.com-20120718093741-jblwrk0wgndv8yrt
bzr revid: fva@openerp.com-20120719152916-g2iidm3z7r0z4d3d


Trivial merge