[happy/el6: 21/21] merge f17 for haskell-platform-2011.4

[Jens Petersen]

commit 582014def7a93419eeeba9e4b4b1c8bb22aa2ed9
Merge: ff01cc8 f40b585
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 13 11:13:18 2012 +0900

    merge f17 for haskell-platform-2011.4

 .gitignore |    1 +
 happy.spec |   59 ++++++++++++++++++++++++++++++++++++++++-------------------
 sources    |    2 +-
 3 files changed, 42 insertions(+), 20 deletions(-)
---