[commit: packages/Cabal] ghc-head: Merge branch 'master' of github.com:haskell/cabal (4c5a31f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=4c5a31f4cc68b8307d6ed41ad1c2c258a8d03662

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

commit 4c5a31f4cc68b8307d6ed41ad1c2c258a8d03662
Merge: b4d0c0f 74d7a8e
Author: Ian Lynagh <ian at well-typed.com>
Date:   Sun Apr 28 23:17:36 2013 +0100

    Merge branch 'master' of github.com:haskell/cabal



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

4c5a31f4cc68b8307d6ed41ad1c2c258a8d03662
 cabal-install/Distribution/Client/IndexUtils.hs    |    4 +-
 cabal-install/Distribution/Client/Sandbox.hs       |   95 +++++++++++++++++---
 .../Distribution/Client/Sandbox/Timestamp.hs       |   13 ++-
 cabal-install/Distribution/Client/Setup.hs         |   10 +++
 4 files changed, 105 insertions(+), 17 deletions(-)