[haskell-platform/el6: 60/60] merge 2011.4 from f17

[Jens Petersen]

commit 7bccf74c2964959c1852eda8168be440d94ff933
Merge: 1f1fc6e ca82d1e
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 13 11:36:13 2012 +0900

    merge 2011.4 from f17

 .chain-deps           |    1 +
 .gitignore            |    4 +
 haskell-platform.spec |  224 ++++++++++++++++++++++++++++---------------------
 sources               |    2 +-
 4 files changed, 133 insertions(+), 98 deletions(-)
---