[ghc-network/el6: 26/26] merge f17 for haskell-platform-2011.4

[Jens Petersen]

commit 4c1d5e3b2c85ec31e836552868dc9d6f1cd85223
Merge: 8c069f2 2f9f483
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 13 11:22:32 2012 +0900

    merge f17 for haskell-platform-2011.4

 .gitignore       |    3 ++
 ghc-network.spec |   90 +++++++++++++++++++++++++++++++++++++-----------------
 sources          |    2 +-
 3 files changed, 66 insertions(+), 29 deletions(-)
---