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)
commitf7e246b50a33c329e9730296f7a342e03bc3db72
tree924efcefc93378a6b922a789a945ceff89a77d37
parent4b089dbacd2a14f38a335103cf8ac0779d92f937
parentff1061274c6c94ffe7c32f0801879a3619ed99a1
Merge branch 'ghc-new-flavor'