Merge
authorvra (Tiny) <vra@tinyerp.com>
Thu, 18 Jun 2009 04:14:03 +0000 (09:44 +0530)
committervra (Tiny) <vra@tinyerp.com>
Thu, 18 Jun 2009 04:14:03 +0000 (09:44 +0530)
bzr revid: vra@tinyerp.com-20090618041403-qysntpo0sk6sgeji


Trivial merge