This commit was manufactured by cvs2svn to create branch 'rentzsch'.
Added changes from Jonathan 'Wolf' Rentzsch to rentzsch branch.
Closing branch.
merge3