merged

--- a/src/Pure/ROOT.ML	Wed Mar 24 17:41:25 2010 +0100
+++ b/src/Pure/ROOT.ML	Wed Mar 24 22:08:03 2010 +0100
@@ -92,14 +92,14 @@
 use "term_ord.ML";
 use "term_subst.ML";
 use "old_term.ML";
-use "logic.ML";
 use "General/pretty.ML";
 use "context.ML";
 use "context_position.ML";
+use "sorts.ML";
+use "type.ML";
+use "logic.ML";
 use "Syntax/lexicon.ML";
 use "Syntax/simple_syntax.ML";
-use "sorts.ML";
-use "type.ML";
 use "config.ML";