merge with pso's branch
authorhda@tinyerp.com <>
Fri, 7 Nov 2008 06:37:08 +0000 (12:07 +0530)
committerhda@tinyerp.com <>
Fri, 7 Nov 2008 06:37:08 +0000 (12:07 +0530)
bzr revid: hda@tinyerp.com-20081107063708-lz8botp2vd70hu87


Trivial merge