[network-manager-vpnc: 7/7] Merge remote-tracking branch 'origin/rm-userset'

[Dan Williams <dcbw src gnome org>]

commit df5b9d92e693fdc9eddebf9f2497b2644f201c4a
Merge: 7a67ca4 5debc5d
Author: Dan Williams <dcbw redhat com>
Date:   Sat Feb 12 23:34:31 2011 -0600

    Merge remote-tracking branch 'origin/rm-userset'

 auth-dialog/Makefile.am        |    3 +-
 auth-dialog/main.c             |  344 ++++++++++++++++++----------------------
 common-gnome/keyring-helpers.c |   10 +-
 common-gnome/keyring-helpers.h |    3 +-
 configure.ac                   |    4 -
 properties/Makefile.am         |    2 -
 properties/nm-vpnc.c           |  133 +++++++++-------
 properties/tests/Makefile.am   |    2 -
 src/nm-vpnc-service.c          |   26 +++-
 9 files changed, 257 insertions(+), 270 deletions(-)
---