Index: pyyaml/trunk/lib/yaml/scanner.py
===================================================================
--- pyyaml/trunk/lib/yaml/scanner.py	(revision 117)
+++ pyyaml/trunk/lib/yaml/scanner.py	(revision 118)
@@ -1,8 +1,9 @@
 
 # Scanner produces tokens of the following types:
+# STREAM-START
+# STREAM-END
 # DIRECTIVE(name, value)
 # DOCUMENT-START
 # DOCUMENT-END
-# STREAM-END
 # BLOCK-SEQUENCE-START
 # BLOCK-MAPPING-START
@@ -69,4 +70,7 @@
         self.tokens = []
 
+        # Add the STREAM-START token.
+        self.fetch_stream_start()
+
         # Number of tokens that were emitted through the `get_token` method.
         self.tokens_taken = 0
@@ -369,4 +373,15 @@
     # Fetchers.
 
+    def fetch_stream_start(self):
+        # We always add STREAM-START as the first token and STREAM-END as the
+        # last token.
+
+        # Read the token.
+        mark = self.reader.get_mark()
+        
+        # Add STREAM-END.
+        self.tokens.append(StreamStartToken(mark, mark))
+        
+
     def fetch_stream_end(self):
 
@@ -381,5 +396,5 @@
         mark = self.reader.get_mark()
         
-        # Add END.
+        # Add STREAM-END.
         self.tokens.append(StreamEndToken(mark, mark))