Merge branch 'master' of github.com:apache/spark into udf_array

Conflicts:
	sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala