[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Tue, 19 Jan 2010 07:19:24 +0000 (12:49 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Tue, 19 Jan 2010 07:19:24 +0000 (12:49 +0530)
commit5c5baab147abe0e7f5944013cc2309a95bcb132d
treef53a23e98ad526a7e60f9f73ede994d343c7a680
parent758cd9b7514db70fc1c24a9f1f96cb50ac0bcd09
parentb4e88af1349ddaf637cc30b3606dadc23c4f5a55
[MERGE]

bzr revid: hmo@tinyerp.com-20100119071924-8tnbzkdvm4jqfokz