[MERGE]
authornch@tinyerp.com <>
Wed, 25 Nov 2009 05:12:45 +0000 (10:42 +0530)
committernch@tinyerp.com <>
Wed, 25 Nov 2009 05:12:45 +0000 (10:42 +0530)
bzr revid: nch@tinyerp.com-20091125051245-ypfcr2bayfmo3pjb


Trivial merge