cqlsh: ninja-fix indentation in Shell constructor
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	bin/cqlsh
Merge branch 'cassandra-1.2' into trunk