fix help text for --tspw option of cassandra-cli
patch by hmetske reviewed by dbrosius for CASSANDRA-5643
Merge branch 'cassandra-1.2' into trunk
retain initial cause exceptions for internode encryption issues in MessagingService
patch by hmetske reviewed by dbrosius for CASSANDRA-5644
Merge branch 'cassandra-1.2' into trunk
fix error message spelling with cql select statements
patch by rvieira reviewed by dbrosius for cassandra-5647
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
imports cleanup
patch by Vijay; reviewed by Aleksey Yeschenko for CASSANDRA-5576
update CqlRecordWriter interface
patch by Alex Liu and jbellis for CASSANDRA-5622
merge from 1.2
Make index_interval visible to CQL3 patch by yukim; reviewed by jbellis
for CASSANDRA-5650
Suppress custom exceptions thru jmx
patch by dbrosius reviewed by slebresne for cassandra 5652
Merge branch 'cassandra-1.2' into trunk
improve tracing
patch by jbellis; reviewed by slebresne for CASSANDRA-5638
merge from 1.2
cleanup logger.debug too
merge from 1.2
Updated CREATE CUSTOM INDEX syntax

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5639
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	bin/cqlsh
	doc/cql3/CQL.textile
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java