[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 28 Nov 2012 15:13:52 +0000 (16:13 +0100)
committerVo Minh Thu <vmt@openerp.com>
Wed, 28 Nov 2012 15:13:52 +0000 (16:13 +0100)
commitfc2f4ab8a4890283117a357427efca57dcd401f9
treefc8ff1f038ad2a91ee423dcf66a17f890b284452
parent63de663ece486d37b094d8994f5c53b445ec2aa5
parent7221faf3ee017e673e43ded9ab8573f685f2ecbb
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20121128151352-n9r87jn5tff949ka