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

[Rex Dieter]

commit 434c4e36d6f9dfbe458f2cd0fa316432780948f0
Merge: 7a06f6a 30da4af
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Oct 3 05:54:55 2010 -0500

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

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