[MERGE] merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Fri, 26 Mar 2010 04:35:42 +0000 (10:05 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Fri, 26 Mar 2010 04:35:42 +0000 (10:05 +0530)
bzr revid: mra@tinyerp.com-20100326043542-4ltod5iachq4o419


Trivial merge