Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 May 2012 14:44:30 +0000 (15:44 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 May 2012 14:44:30 +0000 (15:44 +0100)
commitf7c265764245e48ea69295784d1b332ff928b196
tree369b8c65d3109da307f104549ba0d14ff2e8dc31
parentac230c5ef652e27f61d954281ae6a3195e1f9970
parent40c1106c338e209f07023d165f32bff0f75e2e54
Merge branch 'master' of darcs.haskell.org/ghc