[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Mon, 13 Sep 2010 04:43:16 +0000 (10:13 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Mon, 13 Sep 2010 04:43:16 +0000 (10:13 +0530)
bzr revid: uco@tinyerp.com-20100913044316-qogqz4818rs966yz


Trivial merge