merge
authorsbh (Open ERP) <sbh@tinyerp.com>
Mon, 25 Jan 2010 05:14:10 +0000 (10:44 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Mon, 25 Jan 2010 05:14:10 +0000 (10:44 +0530)
commit40cb4beffd99e49c2c3abfcfdec322ddd1de8019
treedb7d539853e35844b2f1518281aeedaa75597b69
parentca052da705c17e8fd5a4dd88f997d8e134ed2561
parent4dd0244aff71a81ef29aed7906c3057addc2b923
merge

bzr revid: sbh@tinyerp.com-20100125051410-akoeusvwbjbx0fm6