Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Tue, 13 Nov 2012 16:25:36 +0000 (16:25 +0000)
committerIan Lynagh <ian@well-typed.com>
Tue, 13 Nov 2012 16:25:36 +0000 (16:25 +0000)

Trivial merge