Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-new-flavor
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 29 Mar 2012 08:31:02 +0000 (10:31 +0200)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 29 Mar 2012 08:31:02 +0000 (10:31 +0200)

Trivial merge