Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Mon, 30 Jul 2012 17:42:56 +0000 (18:42 +0100)
committerIan Lynagh <ian@well-typed.com>
Mon, 30 Jul 2012 17:42:56 +0000 (18:42 +0100)

Trivial merge