[MERGE] Bug Fix lp:670265 ,lp:687326
authorSbh (OpenERP) <sbh@tinyerp.com>
Thu, 9 Dec 2010 06:11:26 +0000 (11:41 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Thu, 9 Dec 2010 06:11:26 +0000 (11:41 +0530)
bzr revid: sbh@tinyerp.com-20101209061126-bagahudiyp2zkdnl


Trivial merge