[kdelibs/f16: 6/6] Merge branch 'master' into f16

[Rex Dieter]

commit 842e4e2b0bc4eae6a39769cb130050483f274ae9
Merge: 94c5710 28f81c0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 28 22:42:54 2011 -0500

    Merge branch 'master' into f16

 kdelibs.spec |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)
---