unbork changelog entries for merges from 1.1.9 and 1.1.10
Merge branch 'cassandra-1.2' into trunk