[MERGE] merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Mon, 5 Apr 2010 04:14:49 +0000 (09:44 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Mon, 5 Apr 2010 04:14:49 +0000 (09:44 +0530)
bzr revid: mra@tinyerp.com-20100405041449-2uogy78ht5jw1mw2


Trivial merge