merge

--- a/src/HOL/Tools/atp_manager.ML	Tue Feb 03 16:40:10 2009 +0100
+++ b/src/HOL/Tools/atp_manager.ML	Tue Feb 03 16:52:01 2009 +0100
@@ -37,7 +37,7 @@
 
 val atps = ref "e remote_vampire";
 val max_atps = ref 5;   (* ~1 means infinite number of atps *)
-val timeout = ref 100;
+val timeout = ref 60;
 
 in