revert 27ed655fd0552055bd1c26c62c098c16501bc32b
Merge branch 'cassandra-1.2' into trunk