[network-manager-applet/menu-rework: 2/2] Merge commit 'origin/master' into menu-rework

[Dan Williams <dcbw src gnome org>]

commit f5e2569ff54d19814790488980b5aaa68182097d
Merge: 8798603... 0aa6450...
Author: Dan Williams <dcbw redhat com>
Date:   Mon Sep 28 17:44:14 2009 -0700

    Merge commit 'origin/master' into menu-rework

 src/connection-editor/nm-connection-editor.c |    5 +----
 src/connection-editor/nm-connection-list.c   |    4 ----
 2 files changed, 1 insertions(+), 8 deletions(-)
---