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

[Rex Dieter]

commit d451222b0d0bd3fdba6fb0a10bf9dec679020369
Merge: 070374b 2a3f516
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 6 10:18:05 2011 -0600

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

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