[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Fri, 2 Dec 2011 15:31:43 +0000 (16:31 +0100)
committerVo Minh Thu <vmt@openerp.com>
Fri, 2 Dec 2011 15:31:43 +0000 (16:31 +0100)
bzr revid: vmt@openerp.com-20111202153143-0xw0yhlxutcpyhgu


Trivial merge