[kdetoys/f14/master: 4/4] Merge branch 'master' into f14

[Rex Dieter]

commit 8090f766b26c1e32740bd9faca29002b5f477650
Merge: f2f7bf3 4b5bde4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 15:01:12 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	kdetoys.spec
    	sources

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