[network-manager-applet: 7/7] Merge remote branch 'origin/ip6only'

[Dan Williams <dcbw src gnome org>]

commit e85030534bf1210617da1af011884b5adc47e6a3
Merge: cb9d7f2 12afb3d
Author: Dan Williams <dcbw redhat com>
Date:   Mon Apr 26 23:57:13 2010 -0700

    Merge remote branch 'origin/ip6only'

 src/connection-editor/page-ip4.c  |   21 +++++++++++++-
 src/connection-editor/page-ip6.c  |   29 +++++++++++++++++--
 src/gconf-helpers/gconf-helpers.c |   56 ++++++++++++++++++++++++++++++++----
 3 files changed, 95 insertions(+), 11 deletions(-)
---