Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Mar 2012 14:19:00 +0000 (14:19 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Mar 2012 14:19:00 +0000 (14:19 +0000)

Trivial merge