[kdebase-workspace/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit ec309508e0820d436ee2a3b2f4b9b63dce876db7
Merge: 5cc2b72 6a8b170
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 21:43:29 2010 -0500

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	kdebase-workspace.spec

 .gitignore             |    2 +-
 kdebase-workspace.spec |    9 ++++++---
 sources                |    2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
---