Merge branch 'master' of git://git.haskell.org/ghc
authorRichard Eisenberg <eir@cis.upenn.edu>
Wed, 23 Oct 2013 18:07:31 +0000 (14:07 -0400)
committerRichard Eisenberg <eir@cis.upenn.edu>
Wed, 23 Oct 2013 18:07:31 +0000 (14:07 -0400)

Trivial merge