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

[Than Ngo]

commit d63ad3c9a61a9c9c7ceb1bc985e18ab4b888a11b
Merge: c1a3723 96c919f
Author: Than Ngo <than at redhat.com>
Date:   Mon Nov 7 12:40:54 2011 +0100

    Merge branch 'master' into f16

 kde-workspace-4.7.3-ksplashx.patch |   12 ++++++++++++
 kdebase-workspace.spec             |    9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletions(-)
---