Merge branch 'master' of http://darcs.haskell.org/ghc
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 19 Jul 2012 12:35:24 +0000 (14:35 +0200)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 19 Jul 2012 12:35:24 +0000 (14:35 +0200)

Trivial merge