[MERGE] Bug fix lp:703969
authorSbh (OpenERP) <sbh@tinyerp.com>
Tue, 18 Jan 2011 07:14:29 +0000 (12:44 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Tue, 18 Jan 2011 07:14:29 +0000 (12:44 +0530)
bzr revid: sbh@tinyerp.com-20110118071429-lq3uid30btf35bfj


Trivial merge