[network-manager-openvpn: 11/12] Merge remote-tracking branch 'origin/rm-userset'

[Dan Williams <dcbw src gnome org>]

commit f9f88161ddaf194d31e94ad34f2e8c3d5214e22c
Merge: 3ef81ce 6645be5
Author: Dan Williams <dcbw redhat com>
Date:   Sat Feb 12 23:35:20 2011 -0600

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

 auth-dialog/Makefile.am                 |   13 +-
 auth-dialog/gnome-two-password-dialog.c |    2 +
 auth-dialog/main.c                      |  326 ++++++++++++++-----------------
 configure.ac                            |   16 +-
 properties/Makefile.am                  |    2 -
 properties/auth-helpers.c               |  119 +++++++-----
 properties/auth-helpers.h               |    7 +-
 properties/import-export.c              |    2 -
 properties/nm-openvpn.c                 |   78 +++-----
 properties/tests/Makefile.am            |    2 -
 properties/tests/test-import-export.c   |   27 +--
 src/nm-openvpn-service.c                |    9 +
 12 files changed, 294 insertions(+), 309 deletions(-)
---