[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 17 Jul 2012 07:58:45 +0000 (09:58 +0200)
committerThibault Delavallée <tde@openerp.com>
Tue, 17 Jul 2012 07:58:45 +0000 (09:58 +0200)
bzr revid: tde@openerp.com-20120717075845-wpdcsvxywunqju5b


Trivial merge