Merge branch 'master' of http://darcs.haskell.org/ghc
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 19 May 2011 08:56:56 +0000 (09:56 +0100)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 19 May 2011 08:56:56 +0000 (09:56 +0100)

Trivial merge