af4383e1b6
(gotta get myself -current again, this is a drag). Also-fixes-problems-noted-by: Wolfgang Helbig & Joerg Wunsch