[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Fri, 5 Oct 2012 12:50:36 +0000 (14:50 +0200)
committerRaphael Collet <rco@openerp.com>
Fri, 5 Oct 2012 12:50:36 +0000 (14:50 +0200)
bzr revid: rco@openerp.com-20121005125036-slbqs4ezwebh3hsv


Trivial merge