[kdenetwork/f14: 2/2] Merge branch 'f15' into f14

[Than Ngo]

commit 6432cbfe27d1b8600b8efd933c0b43ac3f9f21f4
Merge: 3212fa6 0a9249c
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 16:13:10 2011 +0200

    Merge branch 'f15' into f14

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