cleaned cruft out of patch for hadoop-1.2.1