merges
authorNaresh Choksy <nch@tinyerp.com>
Tue, 2 Sep 2008 12:14:27 +0000 (17:44 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Tue, 2 Sep 2008 12:14:27 +0000 (17:44 +0530)
bzr revid: nch@tinyerp.com-20080902121427-hny1wwl1bbzmi2qz


Trivial merge