Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Apr 2013 09:22:49 +0000 (10:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Apr 2013 09:22:49 +0000 (10:22 +0100)

Trivial merge