[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Thu, 9 Feb 2012 09:47:36 +0000 (10:47 +0100)
committerVo Minh Thu <vmt@openerp.com>
Thu, 9 Feb 2012 09:47:36 +0000 (10:47 +0100)
bzr revid: vmt@openerp.com-20120209094736-wrwytl473g3fu30j


Trivial merge