[kdebase/f14/master: 3/3] Merge branch 'master' into f14

[Than Ngo]

commit 10ce38ce04d5a3dafc593fab538f20d3ee49d400
Merge: 2e4e6b1 8651829
Author: Than Ngo <than at redhat.com>
Date:   Thu Sep 30 16:28:54 2010 +0200

    Merge branch 'master' into f14
    
    Conflicts:
    	kdebase.spec

 kdebase-4.3.4-bz#609039-chfn-parse.patch |   37 ++++++++++++++++++++++++++++++
 kdebase.spec                             |   28 +++++++++++++++++-----
 2 files changed, 58 insertions(+), 7 deletions(-)
---