[commit: ghc] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (2c3a3a1)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

https://github.com/ghc/ghc/commit/2c3a3a169b5359ad6730adcef4dbcf5903915c0a

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

commit 2c3a3a169b5359ad6730adcef4dbcf5903915c0a
Merge: f3879c7 37e3f3f
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Jun 21 08:44:54 2013 +0100

    Merge branch 'master' into overlapping-tyfams

 docs/users_guide/7.8.1-notes.xml |  14 ++++
 rts/Adjustor.c                   |   2 +-
 rts/Schedule.c                   |   2 +-
 rts/ghc.mk                       |   2 +
 rts/package.conf.in              | 156 +++++++++++++++++++--------------------
 rts/sm/GCThread.h                |   2 +-
 6 files changed, 97 insertions(+), 81 deletions(-)