[MERGE] Improving check in myriad ways

[Aaron Bentley]

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

Daniel Mark Watkins wrote:
> Attached is a bundle which is the beginnings of work intended to fix LP
> bugs 64783[0] and 96239[1].

Actually, there's no bundle.

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

iD8DBQFHqGWw0F+nu1YWqI0RAu7zAJ9Oco6WUcthm43e/UuE5ajKTp/W1wCePLmN
w837Jen2BmjxLFh8rvMFSUM=
=+Zt2
-----END PGP SIGNATURE-----