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

[Dan Williams <dcbw src gnome org>]

commit ba28a149cb9f5c53393c69593fc3478bfa6df17c
Merge: d6b924e... ae143e8...
Author: Dan Williams <dcbw redhat com>
Date:   Mon Sep 21 13:31:48 2009 -0700

    Merge commit 'origin/master' into cert-paths
    
    Conflicts:
    	src/connection-editor/page-mobile.c

 src/connection-editor/ce-page-mobile.glade   |   29 --------------------------
 src/connection-editor/ce-polkit-button.c     |   29 +++++++++++++++++++++----
 src/connection-editor/nm-connection-editor.c |    1 +
 src/connection-editor/nm-connection-list.c   |    2 +
 src/connection-editor/page-mobile.c          |    5 ----
 5 files changed, 27 insertions(+), 39 deletions(-)
---