[system-config-network/f17: 2/2] Merge branch 'f16' into f17

[Jiří Popelka]

commit 0b3534f7b5de7189b97f2128c48ddb6216a58465
Merge: c828ca5 c651f1c
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Tue Aug 7 16:24:47 2012 +0200

    Merge branch 'f16' into f17

 .gitignore                 |    1 +
 sources                    |    2 +-
 system-config-network.spec |   21 ++++++++++++---------
 3 files changed, 14 insertions(+), 10 deletions(-)
---
diff --cc system-config-network.spec
index bddb523,18d333f..41b80e4
--- a/system-config-network.spec
+++ b/system-config-network.spec
@@@ -103,9 -96,16 +96,19 @@@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/
  %{_bindir}/system-config-network-cmd
  
  %changelog
+ * Tue Aug 07 2012 Jiri Popelka <jpopelka at redhat.com>  1.6.4-1
+ - version 1.6.4
+   - Don't write DEVICE= line (rhbz#846081)
+   - add support for lcs devices
+   - Disable the Bind to MAC address option on bond slave devices (rhbz #504824)
+   - Do not remove GATEWAYDEV from /etc/sysconfig/network (rhbz #602688).
+   - Don't remove route-ethX on save (rhbz #501530)
+   - Establishing a QETH Connection chapter added to help
+   - use xdg-open instead of htmlview
+ 
 +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.3-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
  * Tue Jun 28 2011 Jiri Popelka <jpopelka at redhat.com>  1.6.3-1
  - Support new IPADDRn/PREFIXn syntax
  - Removed conf/ConfPaswd:ConfPwO.getfreeid (rhbz #717120)