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

[Rex Dieter]

commit d4c77cda795ae1111b71ffaf73c1bf6388686ad6
Merge: 9b957b2 8485c52
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 3 05:52:10 2010 -0500

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

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