[commit: ghc] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (4af50af)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/4af50afcc86a98d53eed7f6c0fb0d15e7a824d19

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

commit 4af50afcc86a98d53eed7f6c0fb0d15e7a824d19
Merge: 0276b49 20d8e8c
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Mon May 27 21:37:32 2013 +0100

    Merge branch 'master' into overlapping-tyfams

 Makefile                  |  4 ++--
 compiler/main/DynFlags.hs |  7 ++++++-
 compiler/main/TidyPgm.lhs | 15 +--------------
 ghc.mk                    |  8 ++++++++
 4 files changed, 17 insertions(+), 17 deletions(-)