[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Wed, 14 Nov 2012 08:38:22 +0000 (09:38 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 14 Nov 2012 08:38:22 +0000 (09:38 +0100)
bzr revid: tde@openerp.com-20121114083822-v5zjlspvkhacj4fo


No differences found