[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Fri, 30 Sep 2011 15:16:30 +0000 (17:16 +0200)
committerVo Minh Thu <vmt@openerp.com>
Fri, 30 Sep 2011 15:16:30 +0000 (17:16 +0200)
commit4d1c62316c511b993935a23223b94ec514592e7b
tree80c5e7270b810783c5972f4a8e7078e05bd060a5
parentbd341cc6fee241aa45f71b0770527df683e0472a
parent32cdec2c720481364bbc78ee87c437d05ff9835f
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110930151630-kd84ev0vvs4iu6n8