[MERGE]
authorHarry (OpenERP) <hmo@tinyerp.com>
Fri, 1 Oct 2010 10:28:43 +0000 (15:58 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Fri, 1 Oct 2010 10:28:43 +0000 (15:58 +0530)
bzr revid: hmo@tinyerp.com-20101001102843-lzkhrkefgbmy4q2h


Trivial merge