[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Thu, 24 Feb 2011 11:50:10 +0000 (17:20 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Thu, 24 Feb 2011 11:50:10 +0000 (17:20 +0530)
commit28a5ac73f07520db1976795d6b1f93ac28ae5aca
tree257824ebe7ac48d6d4c7fbd430eb129da1c12641
parent2137084ff44da3f582c61a2efc508187d7e9d858
parent7a12698123654ae5374e6b559780b4d4019a611c
[MERGE]

bzr revid: hmo@tinyerp.com-20110224115010-ozpjes08hb5uu69r