[PATCH] Merge fixes

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Aaron Bentley wrote:
> BTW, my last patch is borked wrt merge_revert, so don't apply it.  I'll
> post an update when I understand what we're trying to do.

Never mind this part.  I never managed to send that patch.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCzeio0F+nu1YWqI0RAgWJAJ4/JDmJ3NCeZ21o7gSNCKFMV2s5OACdEurV
Hd0knTqMNZK/rEfVJ7POTPw=
=217w
-----END PGP SIGNATURE-----