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

Trivial merge