rename tok::annot_qualtypename -> tok::annot_typename, which is both
shorter and  more accurate.  The type name might not be qualified.

llvm-svn: 61788
diff --git a/clang/lib/Parse/ParseTemplate.cpp b/clang/lib/Parse/ParseTemplate.cpp
index f21854d..ed5e224 100644
--- a/clang/lib/Parse/ParseTemplate.cpp
+++ b/clang/lib/Parse/ParseTemplate.cpp
@@ -178,7 +178,7 @@
   if(Tok.is(tok::kw_class) ||
      (Tok.is(tok::kw_typename) && 
          // FIXME: Next token has not been annotated!
-	 NextToken().isNot(tok::annot_qualtypename))) {
+	 NextToken().isNot(tok::annot_typename))) {
     return ParseTypeParameter(Depth, Position);
   }