[qt5-qtbase/f20: 10/10] Merge branch 'master' into f20

[Rex Dieter]

commit df5da79c4b6af059eeef3765f683a6e38cd8c361
Merge: 780dd8b 6a55943
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Oct 18 08:31:48 2013 -0500

    Merge branch 'master' into f20

 .gitignore                                       |    2 +-
 qt5-qtbase.spec                                  |  135 +++++++++++++++++-----
 qtbase-opensource-src-5.2.0-alpha-harfbuzz.patch |   12 ++
 qtbase-qatomic-ppc.patch                         |   22 ++++
 sources                                          |    2 +-
 5 files changed, 140 insertions(+), 33 deletions(-)
---