schoenborno - 2004-03-23

The patch as obtained from diff -p