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)

Trivial merge