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

Simple merge