[PackageKit-Qt/f18: 4/4] Merge branch 'master' into f18

[Rex Dieter]

commit 5cbd616f0c437128324831cf656ec15232acd640
Merge: c6e202c e5ae208
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Mar 7 09:50:54 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	PackageKit-Qt.spec

 ...e-set-an-error-if-we-fail-to-contact-Pack.patch |   79 ++++++++++++++++++++
 PackageKit-Qt.spec                                 |   13 +++-
 2 files changed, 91 insertions(+), 1 deletions(-)
---