[MERGE]: Merged with team branch.
authoruco (Open ERP) <uco@tinyerp.com>
Wed, 1 Sep 2010 10:30:21 +0000 (16:00 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Wed, 1 Sep 2010 10:30:21 +0000 (16:00 +0530)
bzr revid: uco@tinyerp.com-20100901103021-9hk9c4963xa293xz


Trivial merge