[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Fri, 2 Dec 2011 16:05:46 +0000 (17:05 +0100)
committerVo Minh Thu <vmt@openerp.com>
Fri, 2 Dec 2011 16:05:46 +0000 (17:05 +0100)
bzr revid: vmt@openerp.com-20111202160546-t5csnsd6daclcqxs


Trivial merge