[kdelibs/f14/master: 3/3] Merge remote-tracking branch 'origin/master' into f14/master

[Rex Dieter]

commit c58c5869de87659cc77ade26be5d60a4a5686024
Merge: af05a4c 4d49c96
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun May 8 18:59:34 2011 -0500

    Merge remote-tracking branch 'origin/master' into f14/master

 kdelibs-4.6.3-kde258706.patch |  114 +++++++++++++++++++++++++++++++++++++++++
 kdelibs.spec                  |   15 +++++-
 2 files changed, 127 insertions(+), 2 deletions(-)
---