[merge] cleanup remerge tests

[Aaron Bentley]

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

John Arbash Meinel wrote:
> So is that a +1?

Yes.

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

iD8DBQFEpAw50F+nu1YWqI0RAg7mAJ9mnD6sIpQa+JhOTR1f1wF4MED9VACeOjQA
lYRSMzGf89umykowGGHT6+I=
=ZhHv
-----END PGP SIGNATURE-----