Bug 946929 - Part 2, adding more temporary diagnostic code.  r=roc