Merge branch 'master' into new-rdds-protobuf

README

conf/java-opts.template

core/lib/apache-log4j-1.2.16/log4j-1.2.16.jar

core/lib/asm-all-3.3.1.jar

core/lib/colt.jar

core/lib/compress-lzf-0.6.0/LICENSE

core/lib/compress-lzf-0.6.0/compress-lzf-0.6.0.jar

core/lib/guava-r07/COPYING

core/lib/guava-r07/README

core/lib/guava-r07/guava-r07.jar

core/lib/hadoop-0.20.2/CHANGES.txt

core/lib/hadoop-0.20.2/LICENSE.txt

core/lib/hadoop-0.20.2/NOTICE.txt

core/lib/hadoop-0.20.2/README.txt

core/lib/hadoop-0.20.2/bin/hadoop

core/lib/hadoop-0.20.2/bin/hadoop-config.sh

core/lib/hadoop-0.20.2/bin/hadoop-daemon.sh

core/lib/hadoop-0.20.2/bin/hadoop-daemons.sh

core/lib/hadoop-0.20.2/bin/rcc

core/lib/hadoop-0.20.2/bin/slaves.sh