Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 16 Jan 2013 15:39:01 +0000 (15:39 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 16 Jan 2013 15:39:01 +0000 (15:39 +0000)

Trivial merge