[polkit-qt/f14/master: 8/8] Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

commit 5e233752d8213677431301a15d2650b11b3e0806
Merge: 021a58f 94fcbc2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Mar 14 07:47:50 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	polkit-qt-0.96.1-fix-deprecated-warnings.patch
    	polkit-qt.spec

 .gitignore                                     |    3 +-
 polkit-qt-0.95.1-install-cmake-find.patch      |    2 +-
 polkit-qt-0.96.1-fix-deprecated-warnings.patch |   71 ------------------------
 polkit-qt-0.96.1-null-checking.patch           |   14 -----
 polkit-qt.spec                                 |   40 +++++++------
 sources                                        |    2 +-
 6 files changed, 25 insertions(+), 107 deletions(-)
---