[MERGE] bug fix
authorSbh (OpenERP) <sbh@tinyerp.com>
Thu, 25 Nov 2010 11:28:05 +0000 (16:58 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Thu, 25 Nov 2010 11:28:05 +0000 (16:58 +0530)
bzr revid: sbh@tinyerp.com-20101125112805-gndlscrzeqikdxxb


Trivial merge