[commit: base] data-proxy: Merge branch 'master' into data-proxy (5b8c2b9)

[Richard Eisenberg]

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

On branch  : data-proxy

http://hackage.haskell.org/trac/ghc/changeset/5b8c2b99c408f3ac0204d8a86a556f68f50883b0

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

commit 5b8c2b99c408f3ac0204d8a86a556f68f50883b0
Merge: 48f5e61 365b9d8
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Jul 24 12:41:23 2013 +0100

    Merge branch 'master' into data-proxy