replace import junit.framework.* with org.junit.* (junit3 vs junit4)
Merge branch 'cassandra-2.0' into trunk