merged

--- a/src/HOL/Tools/type_lifting.ML	Mon Dec 20 09:31:47 2010 +0100
+++ b/src/HOL/Tools/type_lifting.ML	Mon Dec 20 09:45:26 2010 +0100
@@ -80,7 +80,7 @@
       let
         val names = Name.invents nctxt n k;
       in (names, fold Name.declare names nctxt) end;
-    val (((vs1, vs2), vs3), _) = Name.context
+    val (((vs3, vs2), vs1), _) = Name.context
       |> invents Name.aT (length variances)
       ||>> invents Name.aT (length variances)
       ||>> invents Name.aT (length variances);