Bug 1071317: Remove unused variables
r=gerv a=sgreen