Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Terei <davidterei@gmail.com>
Fri, 9 Dec 2011 00:15:26 +0000 (16:15 -0800)
committerDavid Terei <davidterei@gmail.com>
Fri, 9 Dec 2011 00:15:26 +0000 (16:15 -0800)

Trivial merge