[dbusmenu-qt/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit d31c632f0082cc39d81570c90e389914b2ab9a8e
Merge: 78b0a60 51c5adf
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 21 12:00:19 2010 -0500

    Merge branch 'master' into f14
    
    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(-)
---