[MERGE] Merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Thu, 29 Apr 2010 05:04:35 +0000 (10:34 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Thu, 29 Apr 2010 05:04:35 +0000 (10:34 +0530)
commitc6280e28861cdf6168059070bd135e7b0d4d4100
tree9b4ade7a6e014dcfbd57a1835eef3e9571af4fc6
parentcd55a71c25d4cf4e16f114bb9ad25e2548fbc753
parente35f93dc5d69b9a17e45126d1508c7b532ebace2
[MERGE] Merge with main branch

bzr revid: mra@tinyerp.com-20100429050435-773rzkxy7z2xdeig