[kdetoys/f18: 9/9] Merge branch 'master' into f18

[Rex Dieter]

commit f1a5c5db30f135623410ab744de1655000e5921f
Merge: 16b45ba 8da885b
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Mar 4 11:26:33 2013 -0600

    Merge branch 'master' into f18
    
    Conflicts:
    	.gitignore
    	kdetoys.spec
    	sources

 .gitignore   |    7 +------
 kdetoys.spec |   55 ++++++++++++++++++++++++++++++++++++-------------------
 sources      |    2 +-
 3 files changed, 38 insertions(+), 26 deletions(-)
---