[ghc-X11/el6: 16/16] Merge ../f17 into el6

[Jens Petersen]

commit ed79e5ecc58cad12edf95e54b10bea8f852eba47
Merge: 97b0f6d 9ef7220
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 13 19:03:20 2012 +0900

    Merge ../f17 into el6

 .gitignore   |    1 +
 ghc-X11.spec |   93 +++++++++++++++++++++++++++++++++++++++++----------------
 sources      |    2 +-
 3 files changed, 69 insertions(+), 27 deletions(-)
---