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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit d3e7f0f37c7e020b41767e20bc344c683ae468a7
Merge: 8bac590 3ea331b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Mar 1 17:52:54 2013 +0000

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

 libraries/bin-package-db/bin-package-db.cabal | 2 +-
 libraries/binary                              | 2 +-
 mk/validate-settings.mk                       | 8 ++------
 3 files changed, 4 insertions(+), 8 deletions(-)