-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
We're a bit behind on code review, so I've gone ahead and de-merged this branch merge for the moment. Sorry. :)
Once we're caught up we can review that and bring it back in... might be best to wait until after 1.10 branch since that's coming up in two weeks.
- -- brion vibber (brion @ pobox.com / brion @ wikimedia.org)