4cae0a0ff9
I only have that branch checked out here, so that's why I'm committing there. I'll merge into trunk when I get back home.