Will Farr - 2004-04-07

Unified diff between my changes and the CVS repository on 7-Apr-2004