[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Mon, 3 Sep 2012 13:07:27 +0000 (15:07 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Mon, 3 Sep 2012 13:07:27 +0000 (15:07 +0200)
commit5f9e31431d1bfc81e850594b48d8a4d908afea8e
treee2b55a2c93b7fb67770b68210cfca8692402d309
parent1597d57466e525f0a3de08714e37dc74674a1edd
parentfab8fe4f26af21e4115f75a90827f747eba728bd
[MERGE] from trunk

bzr revid: fva@openerp.com-20120903130727-6ksf7ldnd4nv309y