Fix possible divide-by-zero in HHOM
patch by jbellis for CASSANDRA-5990
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
enhance UntypedResultSet
patch by Ben Coverston; reviewed by jbellis for CASSANDRA-6000
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk