[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 07:46:57 +0000 (13:16 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Mon, 12 Jul 2010 07:46:57 +0000 (13:16 +0530)
bzr revid: hmo@tinyerp.com-20100712074657-wiqjddnycxzq2qz5


Trivial merge