[MERGE]
authornch@tinyerp.com <>
Wed, 3 Feb 2010 11:42:45 +0000 (17:12 +0530)
committernch@tinyerp.com <>
Wed, 3 Feb 2010 11:42:45 +0000 (17:12 +0530)
bzr revid: nch@tinyerp.com-20100203114245-ckd67m0wfwwnysm8


Trivial merge