[MERGE]
authornch@tinyerp.com <>
Thu, 26 Nov 2009 13:09:42 +0000 (18:39 +0530)
committernch@tinyerp.com <>
Thu, 26 Nov 2009 13:09:42 +0000 (18:39 +0530)
bzr revid: nch@tinyerp.com-20091126130942-183kx8lxq23d9nxg


Trivial merge