merge
authorsbh (Open ERP) <sbh@tinyerp.com>
Fri, 8 Jan 2010 07:07:31 +0000 (12:37 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Fri, 8 Jan 2010 07:07:31 +0000 (12:37 +0530)
bzr revid: sbh@tinyerp.com-20100108070731-ac0thxljh3ozt1rd


Trivial merge