[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 24 Aug 2012 14:40:07 +0000 (16:40 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 24 Aug 2012 14:40:07 +0000 (16:40 +0200)
bzr revid: tde@openerp.com-20120824144007-4r11uoy3sux5f7cv


Trivial merge