Merge branch 'master' of http://darcs.haskell.org//ghc
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Tue, 29 Nov 2011 19:20:33 +0000 (19:20 +0000)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Tue, 29 Nov 2011 19:20:33 +0000 (19:20 +0000)
commit42e3b5bd3ee9c555adaaf1e5a12f7ddd71423c0c
tree0e8ca1886f847d878ab9b9126c2268e4c8b54a1b
parente4d87e140697bcb380cc51a5aee598409930281e
parent1f7433b7b998dda4dde6d09f22a37f637745c079
Merge branch 'master' of darcs.haskell.org//ghc