[ghc-X11-xft/el6: 3/3] Merge remote-tracking branch 'origin/master' into el6

[Jens Petersen]

commit adcd98d971642c16d4d03262e0df1e07175e7393
Merge: 72f9155 5e13250
Author: Jens Petersen <petersen at redhat.com>
Date:   Sun May 20 21:04:38 2012 +0900

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

 ghc-X11-xft.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---