[kdetoys/f13/master: 3/3] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit cd890f0ad4adf86047f5fc7566d7d674ae52a1a9
Merge: 8346f76 3b1c166
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 10:57:51 2011 -0600

    Merge remote branch 'origin/f14/master' into f13/master

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