Merge branch 'master' of http://darcs.haskell.org/ghc
authorDavid Waern <david.waern@gmail.com>
Mon, 13 Jun 2011 20:51:52 +0000 (20:51 +0000)
committerDavid Waern <david.waern@gmail.com>
Mon, 13 Jun 2011 20:51:52 +0000 (20:51 +0000)

Trivial merge