[kde-plasma-networkmanagement/f14/master: 2/2] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 4029e5f3adf0311b01bd0ba266584775a5a293a1
Merge: acfe2d8 7dc87e5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Oct 11 10:51:13 2010 -0500

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

 .gitignore                           |    2 +-
 kde-plasma-networkmanagement.spec    |   13 ++--
 networkmanagement-kdebug238325.patch |  122 ----------------------------------
 sources                              |    2 +-
 4 files changed, 8 insertions(+), 131 deletions(-)
---