[commit: packages/Cabal] ghc-head: Merge pull request #1495 from thoughtpolice/amp-fix (fe54d05)

[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=fe54d05f95d0360258c587638e0c1ec248a8ab0c

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

commit fe54d05f95d0360258c587638e0c1ec248a8ab0c
Merge: 239a6f3 de31c19
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Mon Sep 9 10:04:53 2013 -0700

    Merge pull request #1495 from thoughtpolice/amp-fix
    
    Fix AMP warnings



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

fe54d05f95d0360258c587638e0c1ec248a8ab0c
 Cabal/Distribution/Compat/ReadP.hs       |   10 +++++++---
 Cabal/Distribution/Simple/BuildTarget.hs |    6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)