Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Wed, 6 Feb 2013 14:10:39 +0000 (14:10 +0000)
committerIan Lynagh <ian@well-typed.com>
Wed, 6 Feb 2013 14:10:39 +0000 (14:10 +0000)

Trivial merge