merge with pso branch
authorhda (Tiny) <hda@tinyerp.com>
Wed, 24 Dec 2008 10:55:43 +0000 (16:25 +0530)
committerhda (Tiny) <hda@tinyerp.com>
Wed, 24 Dec 2008 10:55:43 +0000 (16:25 +0530)
bzr revid: hda@tinyerp.com-20081224105543-d76dcs9q1t8t6j91


Trivial merge