[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (d523215)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/d523215fdf1aaa2081c2dd319854bd5f2689cdd3

>---------------------------------------------------------------

commit d523215fdf1aaa2081c2dd319854bd5f2689cdd3
Merge: ed63eae... 58803d7...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Nov 11 16:06:54 2011 +0000

    Merge branch 'master' of http://darcs.haskell.org/ghc

 compiler/iface/FlagChecker.hs      |   10 +++++++---
 compiler/main/DriverPipeline.hs    |    8 +++++---
 compiler/typecheck/TcCanonical.lhs |   31 +++++++++++++++++++++----------
 compiler/typecheck/TcSMonad.lhs    |    6 ++++--
 rts/win32/Ticker.c                 |    3 ++-
 5 files changed, 39 insertions(+), 19 deletions(-)