[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Mon, 6 Sep 2010 04:53:32 +0000 (10:23 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Mon, 6 Sep 2010 04:53:32 +0000 (10:23 +0530)
bzr revid: vir@tinyerp.com-20100906045332-bl1sn0dqo3xq6drb


Trivial merge