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

Trivial merge