[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 20 Jul 2012 08:20:47 +0000 (10:20 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 20 Jul 2012 08:20:47 +0000 (10:20 +0200)
bzr revid: tde@openerp.com-20120720082047-5i1r9sslqqh0a9s8


Trivial merge