Merge Daniel and David's work from git://lair.fifthhorseman.net/~dkg/msva-perl.

diff --cc lib/Crypt/Monkeysphere/Keyserver.pm
Simple merge

diff --cc lib/Crypt/Monkeysphere/MSVA.pm
Simple merge

diff --cc lib/Crypt/Monkeysphere/MSVA/Monitor.pm
Simple merge

diff --cc lib/Crypt/Monkeysphere/Validator.pm
Simple merge

diff --cc t/10.keyserver/20.fetch_fpr.t
Simple merge

diff --cc t/10.keyserver/20.fetch_uid.t
Simple merge

diff --cc t/20.validator/10.findall.t
index 0000000000000000000000000000000000000000,dbbd48aaba6aa378cb390664d8ba9af2920aea18..dbbd48aaba6aa378cb390664d8ba9af2920aea18
mode 000000,100644..100644
--- /dev/null
--- 2/unit-tests/20.validator/10.findall.t
+++ b/t/20.validator/10.findall.t

diff --cc t/20.validator/20.lookup.t
Simple merge

diff --cc t/40.keytrans/01.openssh_pack.t
index 0000000000000000000000000000000000000000,00cff1adb81daf69705816cb22105b254abe243a..00cff1adb81daf69705816cb22105b254abe243a
mode 000000,100644..100644
--- /dev/null
--- 2/unit-tests/40.keytrans/01.openssh_pack.t
+++ b/t/40.keytrans/01.openssh_pack.t

diff --cc t/40.keytrans/10.openpgp2ssh.t
index 0000000000000000000000000000000000000000,ed042fa55e805e14834f7f5a2148783c9b0c5fc4..ed042fa55e805e14834f7f5a2148783c9b0c5fc4
mode 000000,100644..100644
--- /dev/null
--- 2/unit-tests/40.keytrans/10.openpgp2ssh.t
+++ b/t/40.keytrans/10.openpgp2ssh.t

diff --cc t/40.keytrans/20.sshfpr.t
index 0000000000000000000000000000000000000000,d00a4b6f8b72047b6226588eae779be250e55fc5..d00a4b6f8b72047b6226588eae779be250e55fc5
mode 000000,100644..100644
--- /dev/null
--- 2/unit-tests/40.keytrans/20.sshfpr.t
+++ b/t/40.keytrans/20.sshfpr.t

diff --cc t/README
index 0000000000000000000000000000000000000000,a71d15d992be40edb0ac294ce76c9f2474c68bf0..4668fbd87ec41f4971e324accb9722cfcb738272
mode 000000,100644..100644
--- /dev/null
--- 2/unit-tests/README
+++ b/t/README
@@@ -1,0 -1,7 +1,7 @@@
 -   perl run-tests.pl
+ To run all unit tests, 
+ 
++   ./Build test
+ 
+ to run a subset,
+ 
+    perl run-tests.pl dir1 [dir2..]

diff --cc t/TODO
index 0000000000000000000000000000000000000000,b0a7902c4d72ca74f5b7b49686806ec94fd3bec2..b0a7902c4d72ca74f5b7b49686806ec94fd3bec2
mode 000000,100644..100644
--- /dev/null
--- 2/unit-tests/TODO
+++ b/t/TODO

diff --cc t/keys.txt
index 0000000000000000000000000000000000000000,61e656366e9f7553a66bd4e28b108e30f45acd55..61e656366e9f7553a66bd4e28b108e30f45acd55
mode 000000,100644..100644
--- /dev/null
--- 2/unit-tests/keys.txt
+++ b/t/keys.txt