[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Thu, 13 Sep 2012 13:15:57 +0000 (15:15 +0200)
committerRaphael Collet <rco@openerp.com>
Thu, 13 Sep 2012 13:15:57 +0000 (15:15 +0200)
bzr revid: rco@openerp.com-20120913131557-pn9b9utz2s89trzw


Trivial merge