[MERGE] Merged with web/trunk.
authorThibault Delavallée <tde@openerp.com>
Thu, 12 Jul 2012 08:16:14 +0000 (10:16 +0200)
committerThibault Delavallée <tde@openerp.com>
Thu, 12 Jul 2012 08:16:14 +0000 (10:16 +0200)
bzr revid: tde@openerp.com-20120712081614-t1cv6wmisvaeeae4


Trivial merge