merges
authorNaresh Choksy <nch@tinyerp.com>
Fri, 10 Oct 2008 07:17:46 +0000 (12:47 +0530)
committerNaresh Choksy <nch@tinyerp.com>
Fri, 10 Oct 2008 07:17:46 +0000 (12:47 +0530)
bzr revid: nch@tinyerp.com-20081010071746-umiciixn0udbrqgj


Trivial merge