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

[Rex Dieter]

commit fb93c1319674ae61a593e5b50e8fa237210e37b6
Merge: 7b4fd6b efb02ca
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Oct 13 08:34:33 2010 -0500

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

 kdebase-4.5.2-folderview_sorting_kde227157.patch |   38 ++++++++++++++++++++++
 kdebase.spec                                     |    8 ++++-
 2 files changed, 45 insertions(+), 1 deletions(-)
---