[qt/f13/master: 60/61] Merge branch 'master' into f13

[Than Ngo]

commit 1b482b12fa6453da32c812742993aaed8a461e95
Merge: ba1464f 9978f4f
Author: Than Ngo <than at redhat.com>
Date:   Wed Sep 22 10:34:06 2010 +0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	qt.spec
    	sources

 .gitignore                                         |    5 +-
 qt-all-opensource-src-4.4.0-rc1-as_IN-437440.patch |   41 --
 ...erywhere-opensource-src-4.6.0-beta1-qdoc3.patch |   21 -
 ...ywhere-opensource-src-4.6.0-gst-pulsaudio.patch |   60 ---
 ...erywhere-opensource-src-4.7.0-beta1-s390x.patch |   61 +++
 ...e-opensource-src-4.7.0-beta2-kde4_plugins.patch |   16 +-
 ...e-opensource-src-4.7.0-beta2-mysql_config.patch |   18 +-
 ...ource-src-4.7.0-beta2-phonon_servicesfile.patch |   42 +-
 qt-x11-opensource-src-4.5.0-gcc_hack.patch         |   14 -
 qt-x11-opensource-src-4.5.2-pulseaudio.patch       |   43 --
 ...ensource-src-4.5.3-system_ca_certificates.patch |   25 --
 qt.spec                                            |  405 +++++++++++---------
 sources                                            |    2 +-
 13 files changed, 318 insertions(+), 435 deletions(-)
---