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

Trivial merge