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

[Jens Petersen]

commit 0f101e2f3d3d14f6ec2f76fc05696e5740da8179
Merge: 561f9f4 69c80c6
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Nov 17 16:49:46 2011 +0900

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

 ghc-rpm-macros.ghc  |   12 +++++++-----
 ghc-rpm-macros.spec |   10 +++++++++-
 2 files changed, 16 insertions(+), 6 deletions(-)
---