Fix bad merge (commit: 88b9d95165b5f83896be740bcfff260ff8e2009d)
Fix AssertionError during repair

patch by yukim and slebresne; reviewed by yukim and slebresne for CASSANDRA-5245
Merge branch 'cassandra-1.2' into trunk