[MERGE] Merged with addons/trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 13 Jul 2012 08:01:09 +0000 (10:01 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 13 Jul 2012 08:01:09 +0000 (10:01 +0200)
bzr revid: tde@openerp.com-20120713080109-lmm4gjybb6dzqqhq


Trivial merge