Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-new-flavor
authorDimitrios.Vytiniotis <dimitris@microsoft.com>
Thu, 5 Apr 2012 08:03:31 +0000 (09:03 +0100)
committerDimitrios.Vytiniotis <dimitris@microsoft.com>
Thu, 5 Apr 2012 08:03:31 +0000 (09:03 +0100)

Trivial merge