Rhett Sutphin - 2005-02-04

Suggested fix (three source files & a patch)