merges
authorNaresh Choksy <nch@tinyerp.com>
Fri, 24 Oct 2008 09:19:05 +0000 (14:49 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Fri, 24 Oct 2008 09:19:05 +0000 (14:49 +0530)
bzr revid: nch@tinyerp.com-20081024091905-978fasyj2f4mo2lb


Trivial merge