[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 10 Aug 2012 07:34:44 +0000 (09:34 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 10 Aug 2012 07:34:44 +0000 (09:34 +0200)
bzr revid: tde@openerp.com-20120810073444-hm8lfcpnoelmunf3


Trivial merge