[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 09:58:06 +0000 (10:58 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 15 Jan 2013 09:58:06 +0000 (10:58 +0100)
bzr revid: tde@openerp.com-20130115095806-x7at7c4mf6y3hf3a


Trivial merge