Merge branch 'terasort' of https://github.com/rxin/spark into terasort

Conflicts:
	examples/src/main/scala/org/apache/spark/examples/terasort/RecordWrapper.scala
	examples/src/main/scala/org/apache/spark/examples/terasort/TeraSort.scala
	examples/src/main/scala/org/apache/spark/examples/terasort/TeraSortSerializer.scala