r=nelson r=thomas. patch in bug + white space changes suggested by nelson. git-svn-id: svn://10.0.0.236/trunk@192798 18797224-902f-48f8-a5cc-f745e15eee43