Merge branch 'master' of http://darcs.haskell.org/ghc
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Wed, 16 Nov 2011 17:40:43 +0000 (17:40 +0000)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Wed, 16 Nov 2011 17:40:43 +0000 (17:40 +0000)

Trivial merge