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

[Rex Dieter]

commit 846b90daebe5c53e6eb74e6506b1e92dff4ee152
Merge: d4c77cd 73133a9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 19:33:42 2010 -0600

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

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