merging from the trunk
authormga (Tiny/Axelor) <mga@tinyerp.com>
Wed, 4 Feb 2009 12:42:33 +0000 (18:12 +0530)
committermga (Tiny/Axelor) <mga@tinyerp.com>
Wed, 4 Feb 2009 12:42:33 +0000 (18:12 +0530)
bzr revid: mga@tinyerp.com-20090204124233-ityg49wrsc9i471o


Trivial merge