Comment 7 for bug 737603

And there was a missing space in the patch, so it didn't build either. Here's an updated patch; I guess I'll have one more update once it manages to build and I figure out what doesn't work about it at runtime. ;)