pinder - 2005-04-06

Patch file for the mentioned fixes