Update versions for 2.0 final release
Optimize name query performance in wide rows
patch by rbranson; reviewed by jbellis for CASSANDRA-5966
Merge branch 'cassandra-1.2' into cassandra-2.0
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
make sure c* returns the correct version when running inside an IDE (for cqlsh)
patch by dbrosius reviewed by jbellis for cassandra-5964
Merge branch 'cassandra-2.0' into trunk
Allow local batchlog writes for CL.ANY
patch by jbellis; reviewed by Aleksey for CASSANDRA-5967
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Update netty dependency to 3.6.6
Stop using Thrift-generated Index* classes internally

patch by Aleksey Yeschenko; reviewed by Dave Brosius for CASSANDRA-5971
Merge tag 'cassandra-2.0.0' into cassandra-2.0

Apache Cassandra 2.0.0 release
Add back updated licenses
Merge branch 'cassandra-1.2' into cassandra-2.0
License filename renaming
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	lib/licenses/slf4j-log4j12-1.7.2.txt
cleanup
Improve error message when yaml contains invalid properties
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-5958