fix nodetool ownership display with vnodes
patch by jbellis; reviewed by yukim for CASSANDRA-5065
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
fix multithreaded compaction deadlock
patch by Carl Yeksigian; reviewed by jbellis for CASSANDRA-4492
merge from 1.1
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
add close method to EchoedRow
merge from 1.1
Merge branch 'cassandra-1.2.0' into cassandra-1.2
add one more compactedRow.close on empty (#4492)
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
fix specifying and altering crc_check_chance;
patch by Marcus Eriksson and Aleksey Yeschenko, reviewed by Aleksey
Yeschenko for CASSANDRA-5053
Merge branch 'cassandra-1.1' into cassandra-1.2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/io/compress/CompressionParameters.java
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Log compaction merge counts; patch by yukim reviewed by jbellis for CASSANDRA-4894
Merge branch 'cassandra-1.2' into trunk