[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Fri, 28 Sep 2012 12:45:41 +0000 (14:45 +0200)
committerRaphael Collet <rco@openerp.com>
Fri, 28 Sep 2012 12:45:41 +0000 (14:45 +0200)
bzr revid: rco@openerp.com-20120928124541-03ux8j6kpkmqw3vc


Trivial merge