Merge branch 'master' of http://darcs.haskell.org/ghc
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Mon, 28 Nov 2011 13:31:19 +0000 (13:31 +0000)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Mon, 28 Nov 2011 13:31:19 +0000 (13:31 +0000)

Trivial merge