[kdeadmin/f14/master: 5/5] Merge branch 'master' into f14

[Rex Dieter]

commit 9b957b280a54980528c3b972f4acbb5e763d9e10
Merge: fa720d7 1821868
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Aug 29 13:44:37 2010 -0500

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

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