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

[Rex Dieter]

commit e2cee2cd8e316a1dad36ea3d6823fac345f712e8
Merge: 13745b8 40984c1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Nov 14 09:48:21 2011 -0600

    Merge branch 'master' into f16

 kdelibs-4.6.80-halectomy.patch |  131 ----------------------------------------
 kdelibs.spec                   |   13 ++---
 2 files changed, 5 insertions(+), 139 deletions(-)
---