[commit: packages/Cabal] ghc-head: Merge pull request #1300 from 23Skidoo/misc-fixes (01383c2)

[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=01383c2c764ba0c0d0522de7af7a1c7b9cc63946

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

commit 01383c2c764ba0c0d0522de7af7a1c7b9cc63946
Merge: 4c5a31f 05bcdb3
Author: Mikhail Glushenkov <the.dead.shall.rise at gmail.com>
Date:   Mon Apr 29 08:36:05 2013 -0700

    Merge pull request #1300 from 23Skidoo/misc-fixes
    
    Misc fixes here and there



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

01383c2c764ba0c0d0522de7af7a1c7b9cc63946
 cabal-install/Distribution/Client/IndexUtils.hs    |    9 +++---
 cabal-install/Distribution/Client/Sandbox.hs       |   19 +++++++++----
 cabal-install/Distribution/Client/Sandbox/Index.hs |   30 ++++++++++++++++++--
 .../Distribution/Client/Sandbox/Timestamp.hs       |   13 +++++----
 cabal-install/Distribution/Compat/Time.hs          |    4 +++
 cabal-install/Main.hs                              |    4 +--
 6 files changed, 58 insertions(+), 21 deletions(-)