[kdeadmin/f14: 2/2] Merge remote-tracking branch 'origin/f15' into f14

[Jaroslav Reznik]

commit 9b912f325f1b1de73b7b8d1db53ab975ada883be
Merge: 258e275 f7e030e
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 15:41:25 2011 +0200

    Merge remote-tracking branch 'origin/f15' into f14

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