Merge branch 'ghc-new-flavor'
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 May 2012 14:50:54 +0000 (15:50 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 9 May 2012 14:50:54 +0000 (15:50 +0100)

Trivial merge