[ghc-deepseq/el6: 14/14] Merge remote-tracking branch 'origin/f17' into el6

[Jens Petersen]

commit f30d6c5a32dcd398b016ca530eb75084c196e0a0
Merge: 38d335b 4411132
Author: Jens Petersen <petersen at redhat.com>
Date:   Sat May 12 19:11:39 2012 +0900

    Merge remote-tracking branch 'origin/f17' into el6

 .gitignore       |    1 +
 ghc-deepseq.spec |   83 ++++++++++++++++++++++++++++++++++++++---------------
 sources          |    2 +-
 3 files changed, 61 insertions(+), 25 deletions(-)
---