Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Sun, 5 Aug 2012 18:51:42 +0000 (19:51 +0100)
committerIan Lynagh <ian@well-typed.com>
Sun, 5 Aug 2012 18:51:42 +0000 (19:51 +0100)

Trivial merge