[kdetoys/f17: 2/2] Merge branch 'f18' into f17

[Rex Dieter]

commit 544b0fa2facd0807b8202638ebd89fdb2ab96e05
Merge: 6af81c3 70a5220
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 17:01:09 2012 -0500

    Merge branch 'f18' into f17

 .gitignore   |    1 +
 kdetoys.spec |    5 ++++-
 sources      |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---