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

Trivial merge