Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 20 Mar 2012 09:37:41 +0000 (09:37 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 20 Mar 2012 09:37:41 +0000 (09:37 +0000)

Trivial merge