[kdetoys/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit 2420e7571bb234d0c9b58354708627f66f88a343
Merge: 39ecf8c 7ae5ea7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 22:58:48 2012 -0500

    Merge branch 'master' into f16

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