Pig: disable split combination, add split size param
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-5544
Merge branch 'cassandra-1.2' into trunk
 cqlsh: add vertical output option (see EXPAND)

 patch by Michał Michalski; reviewed by Aleksey Yeschenko for
 CASSANDRA-5597
Fix clqsh test_prompt
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	bin/cqlsh
	pylib/cqlshlib/test/test_cqlsh_completion.py
	pylib/cqlshlib/test/test_cqlsh_output.py