[MERGE]
authormra (Open ERP) <mra@tinyerp.com>
Wed, 5 May 2010 03:51:53 +0000 (09:21 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Wed, 5 May 2010 03:51:53 +0000 (09:21 +0530)
bzr revid: mra@tinyerp.com-20100505035153-zly81r77vq7arhtu


Trivial merge