[MERGE] merged trunk.
authorVo Minh Thu <vmt@openerp.com>
Sat, 24 Sep 2011 14:54:49 +0000 (16:54 +0200)
committerVo Minh Thu <vmt@openerp.com>
Sat, 24 Sep 2011 14:54:49 +0000 (16:54 +0200)
commit4268ca38b77ed489bcbf7566a9619c21cc896717
treeb5dcd41af1e917c32479a752cef08fdbd51649bc
parentcc26f2b5d2fb7e1046989541ba292190901b6276
parentdfccbaf28b77fef5860b9ad60ffdf97f3b4a64e0
[MERGE] merged trunk.

bzr revid: vmt@openerp.com-20110924145449-1lfkhix60fdsucoy
openerp-server