Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Mar 2013 12:17:35 +0000 (12:17 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Mar 2013 12:17:35 +0000 (12:17 +0000)
commitde3a50bdf8dd8327ae47e0e942541f4b7bf54a3e
tree943df75542f83810091d73d60e516de7830747bd
parenta37a7f7beee0d12a1cf600e96c6d4450e01e6607
parent2154b82e97632abef64e73cc0f6c5cd13ab8e71c
Merge branch 'master' of darcs.haskell.org/ghc