[MERGE] Merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Thu, 1 Apr 2010 10:44:21 +0000 (16:14 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Thu, 1 Apr 2010 10:44:21 +0000 (16:14 +0530)
commitde3795e108cf0418fd0b44d0fc6eebc969ffdfab
tree210a98afc0d9c7c8d1dd58867b56ecea7acc01b8
parentf86af1d2c7833120ef6b8f5ef43a8f2ab1155b9a
parentef2ade0632ef16866aaca0a5cf07a224a009af31
[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100401104421-7s9xvi6s623y4nhb