[patch] new merge tests suggested by Aaron

[Aaron Bentley]

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

+1

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

iD8DBQFDrDgr0F+nu1YWqI0RApikAJ9dKUrK/o/COkJCdUdLMx1WMqk9dgCdGW/q
rlJm20ldkdJ0JJh31fD5Rmg=
=E4ag
-----END PGP SIGNATURE-----