Commit 2c9d6485a1f89c11f84e720d3c7978dc11a5039a

Behdad Esfahbod 2012-11-23T16:49:19

More tracing fixup