Update versions for 2.0 final release
Update netty dependency to 3.6.6
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
Merge branch 'cassandra-2.0' into trunk
Fix loading index summary containing empty key

patch by yukim; reviewed by jbellis for CASSANDRA-5965
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/io/sstable/IndexSummary.java
	test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java
Merge branch 'cassandra-2.0' into trunk
Fix diffrence typo in HintedHandoffMetrics
Merge branch 'cassandra-2.0' into trunk