[S26] Added Damian's even more latest changes

A nifty command called 'patch' almost managed to apply the updates.diff
file Damian sent to p6l. One hunk failed, but I poked it in manually. Also
removed one line-ending whitespace.

git-svn-id: http://svn.pugscode.org/pugs@29767 c213334d-75ef-0310-aa23-eaa082d1ae64