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

[Jaroslav Reznik]

commit 0a32aca892ab369c18d48d6ac6e7f46568861594
Merge: 6432cbf cc94b86
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Fri Jul 1 17:46:43 2011 +0200

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

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