[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Mon, 13 Aug 2012 19:30:29 +0000 (21:30 +0200)
committerThibault Delavallée <tde@openerp.com>
Mon, 13 Aug 2012 19:30:29 +0000 (21:30 +0200)
bzr revid: tde@openerp.com-20120813193029-jsilsux051e53van


Trivial merge