minor line wrap fix for PR #581
Merge branch 'master' of https://github.com/jyotiska/incubator-spark

Conflicts:
	python/pyspark/context.py
minor line wrap fix for PR #581