Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Terei <davidterei@gmail.com>
Sun, 11 Dec 2011 20:04:19 +0000 (12:04 -0800)
committerDavid Terei <davidterei@gmail.com>
Sun, 11 Dec 2011 20:04:19 +0000 (12:04 -0800)

Trivial merge