[MERGE]
authorBhumika (OpenERP) <sbh@tinyerp.com>
Thu, 31 Mar 2011 13:16:26 +0000 (18:46 +0530)
committerBhumika (OpenERP) <sbh@tinyerp.com>
Thu, 31 Mar 2011 13:16:26 +0000 (18:46 +0530)
bzr revid: sbh@tinyerp.com-20110331131626-u9egxxzfrekj0hwd


Trivial merge