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

[Dan Williams <dcbw src gnome org>]

commit 3182a20edce7647def2a4301d4ca5eadd847739f
Merge: f5e2569... 9088d07...
Author: Dan Williams <dcbw redhat com>
Date:   Mon Sep 28 18:05:29 2009 -0700

    Merge commit 'origin/master' into menu-rework

 src/connection-editor/nm-connection-editor.c |   42 +++++++++++++-------------
 src/connection-editor/nm-connection-list.c   |    2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)
---