[network-manager-applet/perm: 3/3] Merge remote branch 'origin/master' into perm

[Dan Williams <dcbw src gnome org>]

commit d12a3ee9fc8e1f04c7a908822dbd6ccdec6ef1cc
Merge: 46bff3f 714bfd5
Author: Dan Williams <dcbw redhat com>
Date:   Tue Jun 1 15:38:01 2010 -0700

    Merge remote branch 'origin/master' into perm

 src/connection-editor/page-wireless.c  |   88 ++++++++++++----
 src/gconf-helpers/nma-gconf-settings.c |    8 +-
 src/utils/utils.c                      |  172 +++-----------------------------
 3 files changed, 84 insertions(+), 184 deletions(-)
---