merge
authorsbh (Open ERP) <sbh@tinyerp.com>
Mon, 25 Jan 2010 05:14:10 +0000 (10:44 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Mon, 25 Jan 2010 05:14:10 +0000 (10:44 +0530)
bzr revid: sbh@tinyerp.com-20100125051410-akoeusvwbjbx0fm6


Trivial merge