[kdelibs/f13/master: 2/2] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit 2e42a6242fa82ed0356022b2d0ba7cbe03fd46f8
Merge: 66ab7b4 eeb746f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 5 15:19:51 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

 .gitignore                       |    4 +---
 kdelibs-4.5.4-kdoctools_el.patch |   37 -------------------------------------
 kdelibs.spec                     |    9 +++++----
 sources                          |    2 +-
 4 files changed, 7 insertions(+), 45 deletions(-)
---