[MERGE] merge with main branch
authormra (Open ERP) <mra@tinyerp.com>
Tue, 16 Mar 2010 12:37:24 +0000 (18:07 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Tue, 16 Mar 2010 12:37:24 +0000 (18:07 +0530)
bzr revid: mra@tinyerp.com-20100316123724-zowixvrdtiko72fb


Trivial merge