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

Trivial merge