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

[Rex Dieter]

commit 9454a757f8909571a9699ff13b62ad802ec20503
Merge: fb93c13 15103f6
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 19:34:25 2010 -0600

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

 .gitignore                                       |    1 +
 kdebase-4.5.2-folderview_sorting_kde227157.patch |   38 ----------------------
 kdebase.spec                                     |   10 +++---
 sources                                          |    2 +-
 4 files changed, 7 insertions(+), 44 deletions(-)
---