[ghc-gio/el6: 16/16] merge f17 branch for update to ghc-7.0.4

[Jens Petersen]

commit c0cd6aa064012e40f5f6339012a672c33f4f07d0
Merge: 56e9747 0b6f2df
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 13 19:41:02 2012 +0900

    merge f17 branch for update to ghc-7.0.4

 .gitignore   |    3 ++
 ghc-gio.spec |   99 ++++++++++++++++++++++++++++++++++++++-------------------
 sources      |    2 +-
 3 files changed, 70 insertions(+), 34 deletions(-)
---