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

[Rex Dieter]

commit 911f932fc1538c5eae02008bbd3b53d62d1c36da
Merge: a908a6c ce89d1a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Mar 8 12:34:26 2011 -0600

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

 .gitignore                        |    1 +
 kde-plasma-networkmanagement.spec |    9 +++++++--
 sources                           |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---