[network-manager-applet/cert-paths: 4/4] Merge commit 'origin/master' into cert-paths

[Dan Williams <dcbw src gnome org>]

commit d6b924e877c08504f892cdecfd4b7571a131612b
Merge: 185e23a... f3e3c6b...
Author: Dan Williams <dcbw redhat com>
Date:   Mon Sep 21 12:07:02 2009 -0700

    Merge commit 'origin/master' into cert-paths

 src/connection-editor/nm-connection-editor.c |   17 ++++++++++++-----
 src/connection-editor/nm-connection-list.c   |   11 +++++------
 2 files changed, 17 insertions(+), 11 deletions(-)
---