[kdetoys/f16: 8/8] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 78d1adff4346913b54a574c18647e8af565e75f0
Merge: fda8595 fa15cf2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 00:36:54 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdetoys.spec
    	sources

 .gitignore   |    3 +--
 kdetoys.spec |   42 +++++++++++++++++++++++++++++++-----------
 sources      |    2 +-
 3 files changed, 33 insertions(+), 14 deletions(-)
---