Merge
authorsbh (Open ERP) <sbh@tinyerp.com>
Tue, 9 Mar 2010 13:43:48 +0000 (19:13 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Tue, 9 Mar 2010 13:43:48 +0000 (19:13 +0530)
bzr revid: sbh@tinyerp.com-20100309134348-va7w6ehqrtux9u6g


Trivial merge