From-SVN: r4122
Stripped anything added by kane@cc.purdue.edu which is not considered "minor changes" From-SVN: r4090
From-SVN: r4077