Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Jan 2013 08:57:26 +0000 (08:57 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Jan 2013 08:57:26 +0000 (08:57 +0000)

Trivial merge