[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 15 Aug 2012 18:29:06 +0000 (20:29 +0200)
committerThibault Delavallée <tde@openerp.com>
Wed, 15 Aug 2012 18:29:06 +0000 (20:29 +0200)
bzr revid: tde@openerp.com-20120815182906-irmi67sqm0gdsnmy


Trivial merge