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

[Jens Petersen]

commit 76985e72588381ed9b5fe12ee38331a5835d183d
Merge: 20943f0 99b82f1
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 13 11:31:14 2012 +0900

    merge f17 for haskell-platform-2011.4

 .gitignore    |    1 +
 ghc-zlib.spec |   93 +++++++++++++++++++++++++++++++++++++++-----------------
 sources       |    2 +-
 3 files changed, 67 insertions(+), 29 deletions(-)
---