Merge branch 'master' into scala-2.10-wip

conf/metrics.properties.template

core/pom.xml

...in/scala/org/apache/spark/metrics/sink/GraphiteSink.scala

core/src/main/scala/org/apache/spark/rdd/RDD.scala

...main/scala/org/apache/spark/rdd/ZippedPartitionsRDD.scala

...ain/scala/org/apache/spark/scheduler/ShuffleMapTask.scala

...in/scala/org/apache/spark/storage/BlockObjectWriter.scala

.../src/main/scala/org/apache/spark/util/AppendOnlyMap.scala

core/src/main/scala/org/apache/spark/util/Utils.scala

...src/main/scala/org/apache/spark/util/XORShiftRandom.scala

...est/scala/org/apache/spark/util/XORShiftRandomSuite.scala

docs/monitoring.md

docs/tuning.md

...main/scala/org/apache/spark/mllib/clustering/KMeans.scala

pom.xml

project/SparkBuild.scala