Merge branch 'master' of ssh://darcs.haskell.org/home/darcs/ghc
authorDavid Terei <davidterei@gmail.com>
Mon, 1 Aug 2011 20:37:13 +0000 (13:37 -0700)
committerDavid Terei <davidterei@gmail.com>
Mon, 1 Aug 2011 20:37:13 +0000 (13:37 -0700)
1  2 
compiler/main/HscMain.lhs

Simple merge