Thomas Klausner - 2011-01-24

The attached patch fixes the problem.