Ninja-tweak SCF tracing message
Merge branch 'cassandra-1.2' into trunk