[MERGE] FormatRegistry

[Aaron Bentley]

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

John, you gave me a +1 conditional, but I'm not sure whether I satisfied
your concerns.  Can you give me some feedback?

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

iD8DBQFFmwh10F+nu1YWqI0RArSmAJ4u+LOBwH1FK1LRXpnVcvkmsarFvgCeMKN7
LchRWbqaIhOiH3Bckck4LTo=
=D4s6
-----END PGP SIGNATURE-----