[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 9 Jan 2012 13:20:42 +0000 (14:20 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 9 Jan 2012 13:20:42 +0000 (14:20 +0100)
bzr revid: vmt@openerp.com-20120109132042-z1h8t2jgrc7mrfju


Trivial merge