[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Fri, 9 Sep 2011 07:48:20 +0000 (09:48 +0200)
committerVo Minh Thu <vmt@openerp.com>
Fri, 9 Sep 2011 07:48:20 +0000 (09:48 +0200)
commit9ca78ea013dc659418d862eadaf8d5a2ec345f89
tree3b17c34c2eedd677a8809bfc1de84922c2a87fc4
parent4a1597ab16924e613b721a305f8b6d3df51cb673
parente65666493da3befd17f9c2b066f9f12d5ce10648
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110909074820-o89mwdulwx8an13m
openerp-server