Edward J. Huff - 2009-04-27

Patch against cvs of 2009-04-25.