svn commit: r1560768 - /hadoop/common/branches/HDFS-4685/

[cnauroth]

Author: cnauroth
Date: Thu Jan 23 17:49:24 2014
New Revision: 1560768

URL: http://svn.apache.org/r1560768
Log:
Merge trunk to HDFS-4685.

Modified:
    hadoop/common/branches/HDFS-4685/   (props changed)

Propchange: hadoop/common/branches/HDFS-4685/
------------------------------------------------------------------------------
  Merged /hadoop/common/trunk:r1559794-1560767