[MERGE] Merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Mon, 3 May 2010 06:40:56 +0000 (12:10 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Mon, 3 May 2010 06:40:56 +0000 (12:10 +0530)
bzr revid: mra@tinyerp.com-20100503064056-0c0ngzarsyjhdglo


Trivial merge