Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Tue, 29 Nov 2011 01:09:28 +0000 (02:09 +0100)
committerDavid Waern <david.waern@gmail.com>
Tue, 29 Nov 2011 01:09:28 +0000 (02:09 +0100)
1  2 
compiler/parser/Lexer.x

Simple merge