[MERGE] from trunk
authorFrédéric van der Essen <fva@openerp.com>
Tue, 25 Sep 2012 14:10:57 +0000 (16:10 +0200)
committerFrédéric van der Essen <fva@openerp.com>
Tue, 25 Sep 2012 14:10:57 +0000 (16:10 +0200)
commitcf5385a5a8f4f355d8455cbc3aa436d034cce0a5
treee71d306b79169eb0e0305fe20c3e23b7e76a0796
parentab68016f79cc58a369a10c9032d92e41e8877907
parent7debc08809d8836995d0e79c6299ca91bdee1dfe
[MERGE] from trunk

bzr revid: fva@openerp.com-20120925141057-3r9wkxo1y6y5sas9