[libXft/f17: 2/2] Merge branch 'master' into f17

[Adam Jackson]

commit 16bf8fe06ad144b2552ffe146a023d76426ed3aa
Merge: c0635c3 726da86
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Mar 12 11:15:28 2012 -0400

    Merge branch 'master' into f17

 libXft-2.3.0-bold-fix.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 libXft.spec                 |    8 +++++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---