src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
patch by dbrosius reviewed by slebresne for cassandra-6515
Fix typo
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
OCD follow up
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Ninja-fix typo in Tracing
Add cardinality estimator for key count estimation

patch by yukim; reviewed by jbellis for CASSANDRA-5906
cosmetic change
add IRE for invalid CF supplied to get_count
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
Merge branch 'cassandra-2.0' into trunk
Fix AbstractCellName.makeCellName for collections
add StorageService.stopDaemon
patch by Lyuben Todorov; reviewed by Tyler Hobbs for CASSANDRA-4268
Merge branch 'cassandra-2.0' into trunk
asserting that an auto-boxed primitive is not null is pointless
Allow removing snapshots of no-longer-existing CFs
patch by Lyuben Todorov and Mikhail Stepura for CASSANDRA-6418
Merge branch 'cassandra-2.0' into trunk
Rename RowMutation->Mutation in preparation for Row->Partition
add stream.jar to the poms
javadoc fixes