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

[Jens Petersen]

commit 09b3f8f257667fd464748a728a214729dbe80c1b
Merge: 7d9fafe ef334dc
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 13 19:37:06 2012 +0900

    merge f17 branch for update to ghc-7.0.4

 .gitignore    |    3 ++
 ghc-glib.spec |   91 ++++++++++++++++++++++++++++++++++++++++-----------------
 sources       |    2 +-
 3 files changed, 68 insertions(+), 28 deletions(-)
---