Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Mar 2012 13:28:29 +0000 (13:28 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Mar 2012 13:28:29 +0000 (13:28 +0000)

Trivial merge