[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Fri, 27 Jul 2012 13:00:26 +0000 (15:00 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Fri, 27 Jul 2012 13:00:26 +0000 (15:00 +0200)
bzr revid: fva@openerp.com-20120727130026-bif1t1mpakepcqe1


Trivial merge