Changes for Hadoop v1.1.2