[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (3c839ac)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3c839acd302115e5e43668f348b64784cd76413f

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

commit 3c839acd302115e5e43668f348b64784cd76413f
Merge: 6c743b6... a187310...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Feb 15 21:52:53 2013 +0000

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

 compiler/iface/TcIface.lhs        |    2 +-
 compiler/typecheck/TcHsSyn.lhs    |    2 +-
 compiler/typecheck/TcPat.lhs      |    2 +-
 compiler/typecheck/TcRnDriver.lhs |    2 +-
 compiler/types/Type.lhs           |    4 ++++
 5 files changed, 8 insertions(+), 4 deletions(-)