[MERGE]
authoruco (Open ERP) <uco@tinyerp.com>
Wed, 1 Sep 2010 05:02:43 +0000 (10:32 +0530)
committeruco (Open ERP) <uco@tinyerp.com>
Wed, 1 Sep 2010 05:02:43 +0000 (10:32 +0530)
bzr revid: uco@tinyerp.com-20100901050243-defdm2xxy10ebhus


Trivial merge