[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 19:44:49 +0000 (21:44 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 14 Aug 2012 19:44:49 +0000 (21:44 +0200)
bzr revid: tde@openerp.com-20120814194449-lbgwttiax09fhvj6


Trivial merge