Fix CFMetaData.equals()
Consistencify CFMetadata equals/hashCode/toString
Clean up KSMetaData
Clean up Memtable.resolve()
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/Memtable.java
remove dead code
Avoid repairing already repaired data.

Patch by lyubent, yukim and marcuse, reviewed by yukim for CASSANDRA-5153
Add missing files
Remove pre-2.0 supercolumn compatibility code
no need to call toString on a String
Fix EstimatedHistogram races
patch by Paulo Gaspar; reviewed by jbellis for CASSANDRA-6682
Merge branch 'cassandra-2.0' into trunk
Partially revert MM.isReadyForBootstrap change from 6648
Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-6685
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix CleanupTest

patch by marcuse, reviewed by jbellis for CASSANDRA-6679
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	test/unit/org/apache/cassandra/db/CleanupTest.java
Merge branch 'cassandra-2.0' into trunk
Fix CleanupTest

patch by marcuse, reviewed by jbellis for CASSANDRA-6679