[MERGE] With trunk
authorArnaud Pineux <api@openerp.com>
Mon, 26 Nov 2012 11:43:33 +0000 (12:43 +0100)
committerArnaud Pineux <api@openerp.com>
Mon, 26 Nov 2012 11:43:33 +0000 (12:43 +0100)
bzr revid: api@openerp.com-20121126114333-pn7e0ufwnm39fk88


Trivial merge