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

[Dan Williams <dcbw src gnome org>]

commit 7c3b461d586650fbd363246578d713c972b17e46
Merge: 8328a4f d4652b6
Author: Dan Williams <dcbw redhat com>
Date:   Fri Apr 23 12:09:51 2010 -0700

    Merge remote branch 'origin/master' into ip6only

 Makefile.am                                  |    2 +
 autogen.sh                                   |    2 +-
 configure.ac                                 |   57 +++++++++++++-------------
 src/Makefile.am                              |    1 -
 src/applet-device-wifi.c                     |    1 -
 src/applet.c                                 |    1 -
 src/connection-editor/nm-connection-editor.c |    7 ---
 src/gconf-helpers/gconf-upgrade.c            |   17 +++++++-
 src/wireless-helper.h                        |   33 ---------------
 9 files changed, 48 insertions(+), 73 deletions(-)
---