[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Wed, 10 Mar 2010 11:23:53 +0000 (16:53 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Wed, 10 Mar 2010 11:23:53 +0000 (16:53 +0530)
commit50e304188262e8d76875edeb4b7add4ab2e64577
treea0e4ca5ad61fd60b7236518cf37ade645902a31d
parent66c8141cc3d047327546de26e6f5bf48f466f6ec
parent8e87e1d3f3bcd04385d3611956fe99245a10e00b
[MERGE]

bzr revid: hmo@tinyerp.com-20100310112353-rtkiwov4utxuo2fm