merging from the trunk
authorMantavya Gajjar <mga@tinyerp.com>
Thu, 2 Apr 2009 08:52:26 +0000 (14:22 +0530)
committerMantavya Gajjar <mga@tinyerp.com>
Thu, 2 Apr 2009 08:52:26 +0000 (14:22 +0530)
bzr revid: mga@tinyerp.com-20090402085226-s7l8uff7jpzowijp


Trivial merge