[network-manager-applet/ip6only: 6/6] Merge remote branch 'origin/master' into ip6only

[Dan Williams <dcbw src gnome org>]

commit 12afb3d8a6806f5db919ef433ba9476864e8f0a4
Merge: a7d25cf 3cf5b3e
Author: Dan Williams <dcbw redhat com>
Date:   Mon Apr 26 17:35:43 2010 -0700

    Merge remote branch 'origin/master' into ip6only

 Makefile.am                                  |    2 -
 src/applet.c                                 |    5 ++
 src/connection-editor/nm-connection-editor.c |   21 ++++++++++-
 src/connection-editor/nm-connection-editor.h |    9 +++-
 src/connection-editor/nm-connection-list.c   |   43 ++++++++++++++++++++-
 src/gconf-helpers/Makefile.am                |    1 +
 src/gnome-bluetooth/Makefile.am              |    1 +
 src/wireless-dialog.c                        |   53 +++++++++++++++++++++++---
 src/wireless-security/Makefile.am            |    1 +
 9 files changed, 123 insertions(+), 13 deletions(-)
---