6ec93c7866
blown away by the previous commit. Not restored: trailing whitespace changes from rev.1.7. Not restored: -Wall cleanup from rev.1.5.