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

[Rex Dieter]

commit 6af81c355710b21db20a17f5f957c980b4533381
Merge: 18eab55 035c8e5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 8 22:50:16 2012 -0500

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

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