mozilla/shumway — pull request #1315 by tschneidereit (2014-05-22 19:54:40+00:00)
Title: Fix leftovers of insanely botched merge

I truly don't know how cba2698 happened, but this should clean up the rest of the fallout.