scala/scala — pull request #1966 by paulp (2013-01-24 18:55:33+00:00)
Title: Fix java7 again

Because perpetually failing tests are the gifts which keep on giving, especially when trying to perform backports, backport the instrumentation fixes so partest can pass.