[kdebase-workspace/f16: 13/13] Merge branch 'master' into f16

[Rex Dieter]

commit c1a3723ecf651fe8184cdde5c907ffc5f158409d
Merge: bee8c7a 32f6a59
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Nov 4 12:21:26 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	kdebase-workspace.spec

 .gitignore                              |    1 +
 kde-workspace-4.7.2-r300_textures.patch |   45 -------------
 kdebase-workspace-4.7.2-hwclock.patch   |   38 -----------
 kdebase-workspace.spec                  |  111 ++++++++++---------------------
 sources                                 |    3 +-
 5 files changed, 37 insertions(+), 161 deletions(-)
---