Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
authorRichard Eisenberg <eir@cis.upenn.edu>
Fri, 28 Jun 2013 08:35:51 +0000 (09:35 +0100)
committerRichard Eisenberg <eir@cis.upenn.edu>
Fri, 28 Jun 2013 08:35:51 +0000 (09:35 +0100)

Trivial merge