Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Thu, 21 Feb 2013 01:31:50 +0000 (01:31 +0000)
committerIan Lynagh <ian@well-typed.com>
Thu, 21 Feb 2013 01:31:50 +0000 (01:31 +0000)

Trivial merge