[NetworkManager: 11/11] Merge commit '38ea3e9999aff478d05f59c739bc593bc97e2791'

[Adam Williamson]

commit 3a8d9ca672403f5eb7f26dfdd019e9ea6f9441cc
Merge: 9635326 38ea3e9
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Nov 9 11:36:18 2011 -0800

    Merge commit '38ea3e9999aff478d05f59c739bc593bc97e2791'
    
    Conflicts:
    	.gitignore
    	NetworkManager.spec

 .gitignore                       |    2 +
 NetworkManager.spec              |    8 +++++-
 rh719100-dhcp-hostname-fix.patch |   44 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 2 deletions(-)
---
diff --cc .gitignore
index 20e0a58,99c57a1..c6faabe
--- a/.gitignore
+++ b/.gitignore
@@@ -259,6 -259,7 +259,8 @@@ network-manager-applet-0.8.1.tar.bz
  /network-manager-applet-0.8.9997.git20110721.tar.bz2
  /NetworkManager-0.9.0.tar.bz2
  /network-manager-applet-0.9.0.tar.bz2
 +/NetworkManager-0.9.1.90.tar.xz
+ /NetworkManager-0.9.1.90.tar.bz2
+ /network-manager-applet-0.9.1.90.tar.bz2
  /NetworkManager-0.9.1.90.git20110927.tar.bz2
  /network-manager-applet-0.9.1.90.git20110927.tar.bz2
diff --cc NetworkManager.spec
index 0474583,9da7812..fe4e837
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@@ -15,7 -15,7 +15,7 @@@ Name: NetworkManage
  Summary: Network connection manager and user applications
  Epoch: 1
  Version: 0.9.1.90
--Release: 4%{snapshot}%{?dist}
++Release: 5%{snapshot}%{?dist}
  Group: System Environment/Base
  License: GPLv2+
  URL: http://www.gnome.org/projects/NetworkManager/
@@@ -458,8 -460,8 +460,10 @@@ gtk-update-icon-cache %{_datadir}/icons
  %{_libdir}/libnm-gtk.so
  
  %changelog
- * Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.9.1.90-4.git20110927
 -* Fri Oct 21 2011 Jiří Klimeš <jklimes at redhat.com> - 0.9.1.90-4.git20110927
++* Wed Nov  9 2011 Adam Williamson <awilliam at redhat.com> - 1:0.9.1.90-5.git20110927
 +- Rebuilt for glibc bug#747377
+ - core: fix setting hostname from DHCP options (rh #719100)
++- skip a release to keep up with F16
  
  * Tue Sep 27 2011 Dan Williams <dcbw at redhat.com> - 0.9.1.90-3.git20110927
  - core: fix location of wifi.ui (rh #741448)