Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Mon, 17 Sep 2012 20:38:36 +0000 (21:38 +0100)
committerIan Lynagh <ian@well-typed.com>
Mon, 17 Sep 2012 20:38:36 +0000 (21:38 +0100)

Trivial merge