[laughlin-kde-theme/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 88721a2679b7a2580870d64f5cf738d9d9bdc49a
Merge: c87e2f9 1c69032
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 30 11:39:40 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	laughlin-kde-theme.spec
    	sources

 .gitignore              |    2 +-
 laughlin-kde-theme.spec |   16 +++++++++++-----
 sources                 |    2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)
---