Merged the other-tags branch into the trunk (this wasn't an rX:Y merge, since the branch wasn't branched directly from the head of the trunk)

src/token.h

@@ -57,9 +57,10 @@ namespace YAML
 			ANCHOR,
 			ALIAS,
 			TAG,
-			SCALAR
+			PLAIN_SCALAR,
+			NON_PLAIN_SCALAR
 		};
-				
+
 		// data
 		Token(TYPE type_, const Mark& mark_): status(VALID), type(type_), mark(mark_), data(0) {}