[ghc-rpm-macros/el6: 2/2] Merge remote-tracking branch 'origin/f17' into el6

[Jens Petersen]

commit d4bcd68191ba042eaceefc6e70cdde1394347d71
Merge: 4eaef24 6f66b60
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Jul 22 14:50:20 2013 +0900

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

 ghc-rpm-macros.ghc  |    4 ++--
 ghc-rpm-macros.spec |    5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---