Merge
authorsbh (Open ERP) <sbh@tinyerp.com>
Thu, 4 Mar 2010 04:58:41 +0000 (10:28 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Thu, 4 Mar 2010 04:58:41 +0000 (10:28 +0530)
bzr revid: sbh@tinyerp.com-20100304045841-wfkuurvowpauarq1


Trivial merge