Prep for merging 3.4: Undo changes from 3.3 branch

include/clang/Sema/Template.h

Index: include/clang/Sema/Template.h
diff --git a/include/clang/Sema/Template.h b/include/clang/Sema/Template.h
index f9481c6c0c20bd6bf9c4162b9857f2372d376a69..6e054c463a910b0c311882ae144b22a68405c376 100644
--- a/include/clang/Sema/Template.h
+++ b/include/clang/Sema/Template.h
@@ -94,23 +94,17 @@ namespace clang {
     /// \brief Add a new outermost level to the multi-level template argument 
     /// list.
     void addOuterTemplateArguments(const TemplateArgumentList *TemplateArgs) {
-      addOuterTemplateArguments(ArgList(TemplateArgs->data(),
-                                        TemplateArgs->size()));
+      TemplateArgumentLists.push_back(ArgList(TemplateArgs->data(),
+                                              TemplateArgs->size()));
     }
     
     /// \brief Add a new outmost level to the multi-level template argument
     /// list.
     void addOuterTemplateArguments(const TemplateArgument *Args, 
                                    unsigned NumArgs) {
-      addOuterTemplateArguments(ArgList(Args, NumArgs));
+      TemplateArgumentLists.push_back(ArgList(Args, NumArgs));
     }
-
-    /// \brief Add a new outmost level to the multi-level template argument
-    /// list.
-    void addOuterTemplateArguments(ArgList Args) {
-      TemplateArgumentLists.push_back(Args);
-    }
-
+    
     /// \brief Retrieve the innermost template argument list.
     const ArgList &getInnermost() const { 
       return TemplateArgumentLists.front();