Marcus Börger - 2007-03-01

Patch against 2.1.9