[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Thu, 16 Aug 2012 10:48:14 +0000 (12:48 +0200)
committerVo Minh Thu <vmt@openerp.com>
Thu, 16 Aug 2012 10:48:14 +0000 (12:48 +0200)
bzr revid: vmt@openerp.com-20120816104814-52u2l72ycfenbpmy


Trivial merge