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

[Rex Dieter]

commit 995b26687f6288712d85b0dd877a0dbcc934c736
Merge: 434c4e3 b533c3a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sun Nov 7 19:39:49 2010 -0600

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

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