[MERGE] Merged with web/trunk.
authorThibault Delavallée <tde@openerp.com>
Fri, 20 Jul 2012 08:20:55 +0000 (10:20 +0200)
committerThibault Delavallée <tde@openerp.com>
Fri, 20 Jul 2012 08:20:55 +0000 (10:20 +0200)
bzr revid: tde@openerp.com-20120720082055-p04uzdmt8fm0xqne


Trivial merge