Fix compilation with java 6 (JAVA-7147 regression)
Changelog
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/utils/ByteBufferUtil.java