[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Tue, 14 Sep 2010 09:03:44 +0000 (14:33 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Tue, 14 Sep 2010 09:03:44 +0000 (14:33 +0530)
bzr revid: uco@tinyerp.com-20100914090344-bbqjb5ch93d3lsq7


Trivial merge