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