[Merge] Merge bug fix lp:683047,lp:684527
authorSbh (OpenERP) <sbh@tinyerp.com>
Tue, 7 Dec 2010 10:34:29 +0000 (16:04 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Tue, 7 Dec 2010 10:34:29 +0000 (16:04 +0530)
bzr revid: sbh@tinyerp.com-20101207103429-6eix18iy00kh4462


Trivial merge