[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Wed, 27 Jul 2011 12:03:56 +0000 (14:03 +0200)
committerVo Minh Thu <vmt@openerp.com>
Wed, 27 Jul 2011 12:03:56 +0000 (14:03 +0200)
commitb1b97ba9dbe7d13cb24de10e7380d71e9df5ce11
tree94286f4f39c45d3c8ff3c4ee1c250cd7ec30f897
parent55f4e24c663aa27dbbc3465486813d662deea561
parentcbdfc2e879cf7335f5b9883285035c88f49d7a11
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110727120356-x88jcwdyz7mang2q