Merge branch 'master' of git://git.haskell.org/ghc
authorRichard Eisenberg <eir@cis.upenn.edu>
Fri, 18 Oct 2013 13:22:19 +0000 (09:22 -0400)
committerRichard Eisenberg <eir@cis.upenn.edu>
Fri, 18 Oct 2013 13:22:19 +0000 (09:22 -0400)

Trivial merge