Spelling in comment
Better pretty-printing of types and coercions
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
Fix threadDelay on Windows; fixes ThreadDelay001 failures

MSDN says of Sleep:
    If dwMilliseconds is greater than one tick but less than two, the
    wait can be anywhere between one and two ticks, and so on.
so we need to add (milliseconds-per-tick - 1) to the amount of time we
sleep for.
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Fix spelling
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Unify interfae of both variants FP_ARG_WITH_PATH... in aclocal.m4 and
document them.
Tidy up tso->stackobj before calling threadStackUnderflow (#7636)

Fixes the following crash:

  internal error: threadStackUnderflow: not enough space for return values

when using STM.
comments
Require autoconf 2.60, as

version 2.59 seems to be incompatible with our updated macros.
If somebody insists on 2.59 (which is almost 10 years old) I'll
have to hunt down the reason for the recent (Dec 2012?) breakage.

Note that I did not check with 2.60 (I have 2.65), so that one
may still be problematic.
Clean up AC_PREREQ.
Note major changes in 7.8.1 in 7.8.1 release notes file
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
Fix an old and egregious specialisation bug (Trac #5113)

The specialiser needs to know if a dictionay has some structure,
so that it can decide whether to specialise a function. Eg
 (A)    let d = $dfblah d1
        in ....(f d)....

 (B)    \d. ....(f d)....

In (A) it's probably worth specialising f; in (B) it isn't.
Previously we were relying on d's unfolding, but the specialiser
does cloning as it goes, which discards the unfolding. So we
were simply discarding all specialisations for functions with
local dictionary bindings!  This bug seems to have been there
for a long time.

This is what originally caused Trac #5113.  Then we went through a phase
where local bindings were not generalised, and that meant there was
no locally overloaded f to specialise; so the performance problem appeared
to be fixed.  But now we are generalising local bindings again, so it
re-appeared.

This patch fixes the original problem.
Merge branch 'master' of http://darcs.haskell.org/ghc
Don't import TypeRep
Add -fno-cse pragma in DynFlags.hs (fixes #7595)
Split the PlatformConstants type off into its own module
Yet more refactoring in overlapping type-family instances

This patch mainly introduces TcValidity.checkConsistendFamInst,
and uses it when typechecking type-family instances, *including*
default instances.

I find I can't remember why I began this particular saga, but
it's a modest improvement I think.