[commit: packages/Cabal] ghc-head: Merge branch 'master' of https://github.com/manzyuk/cabal (3f4b20b)

[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=3f4b20b0ccd6841e7aabd9f978672299f9c13534

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

commit 3f4b20b0ccd6841e7aabd9f978672299f9c13534
Merge: cf724a1 cf0cf07
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue May 7 08:24:50 2013 -0700

    Merge branch 'master' of https://github.com/manzyuk/cabal



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

3f4b20b0ccd6841e7aabd9f978672299f9c13534
 Cabal/Cabal.cabal                                  |    5 ++++-
 .../PackageDescription/Configuration.hs            |    2 +-
 Cabal/tests/PackageTests.hs                        |    3 +++
 .../SameDepsAllRound => OrderFlags}/Check.hs       |   11 ++++++-----
 Cabal/tests/PackageTests/OrderFlags/Foo.hs         |    8 ++++++++
 Cabal/tests/PackageTests/OrderFlags/my.cabal       |   20 ++++++++++++++++++++
 6 files changed, 42 insertions(+), 7 deletions(-)