[MERGE] merge with trunk
authormra (Open ERP) <mra@tinyerp.com>
Tue, 1 Jun 2010 12:35:23 +0000 (18:05 +0530)
committermra (Open ERP) <mra@tinyerp.com>
Tue, 1 Jun 2010 12:35:23 +0000 (18:05 +0530)
bzr revid: mra@tinyerp.com-20100601123523-ut0l4tl3zd3y4j9t


Trivial merge