ocd
Merge branch 'cassandra-1.2' into cassandra-2.0
Update to jamm-0.2.6
Fix build
Update version for 2.0.5 release
fix fat client tests
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	build.xml