Merge branch 'master' of ssh://git.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 22 Jan 2015 09:42:30 +0000 (09:42 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 22 Jan 2015 09:42:30 +0000 (09:42 +0000)

Trivial merge