Merge branch 'master' of http://git.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 7 Oct 2014 07:03:58 +0000 (08:03 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 7 Oct 2014 07:03:58 +0000 (08:03 +0100)

Trivial merge