[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Fri, 20 Aug 2010 10:59:37 +0000 (16:29 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Fri, 20 Aug 2010 10:59:37 +0000 (16:29 +0530)
commit0f558646fe76da1e3e80ed7d340ff500b7721e9a
tree1c8579f5d687c1885874cfd4a746ed2d0f720b58
parentf6ac68c01676333854feeac3eb39e02f7c32e8ed
parente459cec005710130009309cdcae999c7dd82adee
[MERGE]

bzr revid: hmo@tinyerp.com-20100820105937-4v23reh5iy8k66uf