Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
authorRichard Eisenberg <eir@cis.upenn.edu>
Sat, 1 Dec 2012 17:06:49 +0000 (12:06 -0500)
committerRichard Eisenberg <eir@cis.upenn.edu>
Sat, 1 Dec 2012 17:06:49 +0000 (12:06 -0500)

Trivial merge