OCD-ninja CFMetaData.BatchlogCF -> CFMetaData.BatchlogCf fix
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
OCD-ninja CFMetaData.CompactionLogCF -> CFMetaData.CompactionLogCf fix
fix regression when requested range does not overlap an sstable at all
patch by marcuse; reviewed by jbellis for CASSANDRA-5407