[MERGE] MErging
authorpso (OpenERP) <pso@tinyerp.com>
Wed, 24 Aug 2011 05:32:45 +0000 (11:02 +0530)
committerpso (OpenERP) <pso@tinyerp.com>
Wed, 24 Aug 2011 05:32:45 +0000 (11:02 +0530)
bzr revid: pso@tinyerp.com-20110824053245-8yikzy68usgcnhs9


Trivial merge