Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 25 Oct 2012 17:12:41 +0000 (18:12 +0100)
committerIan Lynagh <ian@well-typed.com>
Thu, 25 Oct 2012 17:12:41 +0000 (18:12 +0100)

Trivial merge