[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Wed, 22 Sep 2010 11:08:07 +0000 (16:38 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Wed, 22 Sep 2010 11:08:07 +0000 (16:38 +0530)
commita7df22912a574a29b78428da0535ef55d41741c7
tree6cda61263edd01e3e263a15db8f27415341ff3b1
parent337dee098700354978b51ebbf046a0b942b8eab8
parent0781486e2f95ee953356431b1607ef24d89bccb6
[MERGE]

bzr revid: hmo@tinyerp.com-20100922110807-til4nklb60o5hl7g