fix bad automatic merge
Merge branch 'cassandra-1.2' into trunk
replace mistaken usage of commons-logging with slf4j
patch by dbrosius reviewed by jbellis for CASSANDRA-5464
switch shuffle's insert of a token to using new blob syntax
patch by dbrosius reviewed by ayeschenko for CASSANDRA-5465
Merge branch 'cassandra-1.2' into trunk
comments
Merge branch 'cassandra-1.2' into trunk
comments
fix OperationType.UNKNOWN compaction message spelling
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
generify
Merge branch 'cassandra-1.2' into trunk
 Fix preparing statements when current keyspace is not set

 patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
 CASSANDRA-5468
Merge branch 'cassandra-1.2' into trunk
fix message spelling
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
remove unused classes ArrayUtil.java/CreationTimeAwareFuture.java
patch by dbrosius reviewed by ayeschenko for CASSANDRA-5474
Merge branch 'cassandra-1.2' into trunk