[MERGE]: Merge with main project branch
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 28 Apr 2011 10:50:46 +0000 (16:20 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 28 Apr 2011 10:50:46 +0000 (16:20 +0530)
commit3057ec29afda38cfa1296f259a27205d5dd3e6ae
treeb205c77b801feac723adac1ee5ea79f70cdf771c
parenta576a5601ba9f4f45b517ea2bb6370c2172c4937
parent91b91a13ffe72fba2d1446dc050fc1639b376210
[MERGE]: Merge with main project branch

bzr revid: rpa@tinyerp.com-20110428105046-0niwm3bbqvs7tihb