Jochen Tucht - 2012-07-15

https://bitbucket.org/jtuc/winmerge2011/changeset/e4b817323f45 addresses the most worrisome aspects of this bug.