Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 15:51:11 +0000 (15:51 +0000)
committerIan Lynagh <ian@well-typed.com>
Mon, 11 Feb 2013 15:51:11 +0000 (15:51 +0000)

Trivial merge