Merge
authorVir (Open ERP) <vir@tinyerp.com>
Mon, 18 Jan 2010 08:33:29 +0000 (14:03 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Mon, 18 Jan 2010 08:33:29 +0000 (14:03 +0530)
bzr revid: vir@tinyerp.com-20100118083329-o8ejmi2ie4fsuj33


Trivial merge