Fix the fat client.
Patch by Carl Yeksigian, reviewed by brandonwilliams for CASSANDRA-5378
Merge branch 'cassandra-1.2' into trunk
Fix fat client.
Patch by Carl Yeksigian, reviewed by brandonwilliams for CASSANDRA-5378