[dbusmenu-qt/f12/master: 7/7] Merge branch 'master' into f12

[Rex Dieter]

commit 05133817f9ea454da1649983c443ad9cbc11c3a6
Merge: ceb7991 51c5adf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 21 12:03:02 2010 -0500

    Merge branch 'master' into f12
    
    Conflicts:
    	.gitignore
    	dbusmenu-qt.spec
    	sources

 .gitignore                             |    2 +-
 dbusmenu-qt-0.3.2-pkgconfig.patch      |   11 -
 dbusmenu-qt.spec                       |   11 +-
 kubuntu_00_external_contributions.diff |  357 ++++++++++++++++++++++++++++++++
 sources                                |    2 +-
 5 files changed, 366 insertions(+), 17 deletions(-)
---