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

[Rex Dieter]

commit 4f49f603b31cf3e703b88f92894671d0fd832b32
Merge: 8090f76 1063a15
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 3 05:56:23 2010 -0500

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

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