[goddard-kde-theme/f13/master: 8/8] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit c9ec691444da93dce33727da595e7b8e441fe91b
Merge: 0d9e654 29142e7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 14 11:42:20 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	goddard-kde-theme.spec
    	sources

 .gitignore             |    2 +-
 goddard-kde-theme.spec |   26 +++++++++++++++++---------
 sources                |    2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)
---