[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:05:07 +0000 (12:05 +0100)
committerVo Minh Thu <vmt@openerp.com>
Mon, 16 Jan 2012 11:05:07 +0000 (12:05 +0100)
commit1064cda2dcac0d2043179803277535a223b54f7c
tree6222a77ad10f8619295a5ce956b767a067575f83
parentd8a66f14c721b0f55d5c38aaa2e7f2bdb4016a81
parent5b10b7022d388e4e758fd448399e581325c6b3dc
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20120116110507-oe4qtvwfy1qcyunl