[MERGE]
authorHarry (Open ERP) <hmo@tinyerp.com>
Wed, 3 Mar 2010 14:33:56 +0000 (20:03 +0530)
committerHarry (Open ERP) <hmo@tinyerp.com>
Wed, 3 Mar 2010 14:33:56 +0000 (20:03 +0530)
commit30c738f6e29611cc0c948af29434935765e2394f
tree336f918eabb67b0a2bdc89ba99ab8b4ce0d4e63a
parent28fc9eff481298efcf7c923835acad4580dab34f
parent5cea9102f8d8318ab715f77f8224e5e1bd08bb3a
[MERGE]

bzr revid: hmo@tinyerp.com-20100303143356-kgjsid75wf9gtsxv