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

[Rex Dieter]

commit 55e291fee65dc5407df2ee1cebabf12b65e8a6b1
Merge: 01c6337 b533c3a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 19:40:08 2010 -0600

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

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