merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Tue, 16 Mar 2010 12:28:10 +0000 (17:58 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Tue, 16 Mar 2010 12:28:10 +0000 (17:58 +0530)
bzr revid: mra@tinyerp.com-20100316122810-z6kw9awpk5lne8ne


Trivial merge