[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Thu, 24 Mar 2011 09:50:56 +0000 (10:50 +0100)
committerVo Minh Thu <vmt@openerp.com>
Thu, 24 Mar 2011 09:50:56 +0000 (10:50 +0100)
commit1c95c0f86606b33ca3d5869003f667313eb1a3cc
tree1dcca16d30ba8aacea74fd082888d6a8bb9b8e80
parent7766fcca6215e7bf27bf436ee484c8beb0d0eaad
parentb5d02ab327b7ed3dc88ccd75be88587556c820b0
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110324095056-38owv76szpr9aro9