[MERGE] Merged from the main trunk server.
authorAnup (OpenERP) <ach@tinyerp.com>
Fri, 11 Jun 2010 11:18:46 +0000 (16:48 +0530)
committerAnup (OpenERP) <ach@tinyerp.com>
Fri, 11 Jun 2010 11:18:46 +0000 (16:48 +0530)
bzr revid: ach@tinyerp.com-20100611111846-drnurfb0apoam02x


Trivial merge