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

[David Waern]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

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

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

commit acd5a11520f74ac582c019dd64e7b0f9727e0409
Merge: a1cef22 8679401
Author: David Waern <waern at ubuntu.(none)>
Date:   Sun Mar 10 12:24:42 2013 -0700

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

 compiler/utils/IOEnv.hs | 20 --------------------
 mk/config.mk.in         |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)