clarity on max hint window
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	conf/cassandra.yaml
Merge branch 'cassandra-1.2' into trunk