[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Wed, 25 Aug 2010 04:47:53 +0000 (10:17 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Wed, 25 Aug 2010 04:47:53 +0000 (10:17 +0530)
bzr revid: uco@tinyerp.com-20100825044753-o2njj501qifxtame


Trivial merge