[MERGE] Merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Thu, 8 Apr 2010 08:53:07 +0000 (14:23 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Thu, 8 Apr 2010 08:53:07 +0000 (14:23 +0530)
commit5c1a3969e4e380208f692dc97775bf67f72ed7e8
tree38edd9559889a1793cffe412610d541cc497fbe4
parent6e7227cfe2cdff08d4fa9e16a09ed3f0710c5948
parent27ad104c7267885ac5619fac48a6dee776f40e1b
[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100408085307-khvtkyw1ns6a39lz