[kdetoys/f13/master: 17/17] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 4be8b2e9495a991fa91cd10fcd45c2fb1f2861ab
Merge: 35b3a06 1063a15
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 09:06:32 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	kdetoys.spec
    	sources

 .gitignore   |    2 +-
 kdetoys.spec |   39 +++++++++++++++++++++++----------------
 sources      |    2 +-
 3 files changed, 25 insertions(+), 18 deletions(-)
---