Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Nov 2011 19:33:48 +0000 (19:33 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 29 Nov 2011 19:33:48 +0000 (19:33 +0000)
commit0d8130d7991945c93a4dcef4faf3ace9ead6d423
tree0a7f1e9bebef6e933df54fd29e7363815874c620
parentb41a351025f0a6e96676891415c409060050e7e8
parent42e3b5bd3ee9c555adaaf1e5a12f7ddd71423c0c
Merge branch 'master' of darcs.haskell.org/ghc