[kde-workspace/f17: 32/32] Merge branch 'master' into f17

[Rex Dieter]

commit d73a98189c5f5aff97cb7433dc2c489365acb744
Merge: f5eab7b c774c73
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 16:36:39 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kde-workspace-4.7.97-redhat_startkde.patch
    	kde-workspace-4.8-redhat_startkde.patch
    	kde-workspace-4.8.97-redhat_startkde.patch
    	kde-workspace.spec
    	sources

 .gitignore                                         |    2 +-
 ...4.8.80-battery-plasmoid-showremainingtime.patch |   12 ++
 kde-workspace-4.8.97-redhat_startkde.patch         |   63 +++++++++++
 ...pace-4.9.0-add_apper_to_kickoff_favorites.patch |   12 ++
 kde-workspace-4.9.0-fontconfigdir.patch            |   25 ++++
 kde-workspace.spec                                 |  117 ++++++++++++++++----
 ...4.5.80-battery-plasmoid-showremainingtime.patch |   16 ---
 kwin-check-opengl.diff                             |   14 ---
 sources                                            |    2 +-
 9 files changed, 208 insertions(+), 55 deletions(-)
---