[PackageKit/f18: 6/6] Merge branch 'master' into f18

[Rex Dieter]

commit c5958fc135e123e3feeeb2501fad8872af622068
Merge: 5264aa0 d915c61
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Oct 2 12:12:09 2012 -0500

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

 ...priority-state-changed-timeout-to-2-secon.patch |   28 +
 ...qt-Break-ABI-to-make-pk-qt-more-closer-to.patch |  711 ++++++++++++++++++++
 PackageKit.spec                                    |   21 +-
 3 files changed, 757 insertions(+), 3 deletions(-)
---