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

[Ian Lynagh]

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

On branch  : master

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

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

commit c9820b25cbbeb0412813f4683596aa8b5c9e21e9
Merge: 13f3a31... 541cc50...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Aug 5 19:51:42 2012 +0100

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

 compiler/main/HscMain.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)