[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Tue, 27 Nov 2012 09:39:15 +0000 (10:39 +0100)
committerRaphael Collet <rco@openerp.com>
Tue, 27 Nov 2012 09:39:15 +0000 (10:39 +0100)
bzr revid: rco@openerp.com-20121127093915-6zupyre5jh2fxfd7


Trivial merge