Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Wed, 8 Aug 2012 12:09:41 +0000 (13:09 +0100)
committerIan Lynagh <ian@well-typed.com>
Wed, 8 Aug 2012 12:09:41 +0000 (13:09 +0100)

Trivial merge