Add timeout events to query traces
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5520
merge from 1.2
Add trigger examples
patch by Vijay; reviewed by jbellis for CASSANDRA-5574
Cleanup AbstractType/TypeSerializer classes

patch by slebresne; reviewed by carlyeks for CASSANDRA-5744
Optimized data structure for range tombstones

patch by slebresne; reviewed by frousseau for CASSANDRA-5677
Merge commit '6e81f816c730de1798fede6073b0908bf49ee5c0' into trunk
Optimized data structure for range tombstones (trunk version)
Fix querying with an empty (impossible) range

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5573
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Remove commented code
Merge branch 'cassandra-1.2' into trunk
remove dead assignment
use StringBuilder vs. StringBuffer
constants s/b static
remove dead field
move CounterSerializer to directory org/apache/cassandra/serializers
fix shuffle disable due to simple typo
patch by dbrosius reviewed by jbellis for CASSANDRA-5756
fix shuffle clear to use new blob literal format
patch by dbrosius reviewed by jbellis for CASSANDRA-5755
add cassandra-shuffle.bat
Merge branch 'cassandra-1.2' into trunk