[MERGE] from trunk
authorRaphael Collet <rco@openerp.com>
Wed, 7 Mar 2012 12:03:04 +0000 (13:03 +0100)
committerRaphael Collet <rco@openerp.com>
Wed, 7 Mar 2012 12:03:04 +0000 (13:03 +0100)
bzr revid: rco@openerp.com-20120307120304-61nx1r0j9130h4di


Trivial merge