[qt/f16: 4/4] Merge branch 'master' into f16

[Rex Dieter]

commit 45a5a11ca898dd0271499037758d7b88d451e791
Merge: a66b9ce 8d515ac
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 27 14:08:38 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	qt.spec

 ...ere-opensource-src-4.8.0-QUrl_toLocalFile.patch |   13 +++++++++++++
 qt.spec                                            |   17 ++++++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)
---