[NetworkManager] Sync with f17

[Daniel Williams]

commit 2a5adcbd653a08d2c25b7b3fb479079c24786dd4
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Mar 14 13:05:48 2012 -0500

    Sync with f17

 NetworkManager.spec |   18 +++++++++++++++---
 sources             |    4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 300a24e..a44f0db 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,8 +7,8 @@
 %define libnl3_version 3.2.6
 %define ppp_version 2.4.5
 
-%define snapshot .git20120302
-%define applet_snapshot .git20120302
+%define snapshot .git20120314
+%define applet_snapshot .git20120314
 %define realversion 0.9.3.995
 
 %if 0%{?fedora} < 17
@@ -21,7 +21,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.9.3.995
-Release: 0.4%{snapshot}%{?dist}
+Release: 0.6%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -496,6 +496,18 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libnm-gtk.so
 
 %changelog
+* Wed Mar 14 2012 Dan Williams <dcbw at redhat.com> - 0.9.3.995-0.6
+- core: fix issue with carrier changes not being recognized (rh #800690)
+- editor: warn user if CA certificate is left blank
+
+* Tue Mar 13 2012 Dan Williams <dcbw at redhat.com> - 0.9.3.995-0.5
+- core: fix a crash with ipw2200 devices and adhoc networks
+- core: fix IPv6 addressing on newer kernels
+- core: fix issue with VPN plugin passwords (rh #802540)
+- cli: enhancements for Bonding, VLAN, and OLPC mesh devices
+- ifcfg-rh: fix quoting WPA passphrases that include quotes (rh #798102)
+- libnm-glib: fix some issues with duplicate devices shown in menus
+
 * Fri Mar  2 2012 Dan Williams <dcbw at redhat.com> - 0.9.3.995-0.4
 - Update to 0.9.3.995 (0.9.4-beta1)
 - core: add support for bonding and VLAN interfaces
diff --git a/sources b/sources
index d054f86..84e61b2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-b285d53563d09ab684db143a0bb430a6  NetworkManager-0.9.3.995.git20120302.tar.bz2
-8c51be14d788851607921a365771bd94  network-manager-applet-0.9.3.995.git20120302.tar.bz2
+9a844d2f890083e9c8ad050aec191e0a  NetworkManager-0.9.3.995.git20120314.tar.bz2
+b2134121d57fbc9e9c65341f62c143ba  network-manager-applet-0.9.3.995.git20120314.tar.bz2