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

Trivial merge