[ghc-haskeline/el6: 9/9] Merge remote-tracking branch 'origin/master' into el6

[Jens Petersen]

commit b94c9749f1d637b33b3ad8d795687a366ac83543
Merge: 958868f f26def3
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed May 23 17:51:33 2012 +0900

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

 .gitignore         |    2 +
 ghc-haskeline.spec |   57 ++++++++++++++++++++++++++++++++++++++++++++++-----
 sources            |    2 +-
 3 files changed, 54 insertions(+), 7 deletions(-)
---