Merge branch 'f17'

Conflicts:
	wireshark.spec

.gitignore

@@ -14,3 +14,4 @@ wireshark-1.2.10.tar.bz2
 /wireshark-1.6.3.tar.bz2
 /wireshark-1.6.4.tar.bz2
 /wireshark-1.6.5.tar.bz2
+/wireshark-1.6.6.tar.bz2

sources

@@ -1 +1 @@
-794948a10d387fc8e37d824ea11dbac9  wireshark-1.6.5.tar.bz2
+61145ccd7684b3cfb159fc902fedfecf  wireshark-1.6.6.tar.bz2

wireshark.spec

@@ -10,7 +10,7 @@
 
 Summary:	Network traffic analyzer
 Name:		wireshark
-Version:	1.6.5
+Version:	1.6.6
 Release:	2%{?dist}
 License:	GPL+
 Group:		Applications/Internet
@@ -340,6 +340,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_sbindir}/idl2wrs
 
 %changelog
+* Wed Mar 28 2012 Jan Safranek <jsafrane@redhat.com> - 1.6.6-1
+- upgrade to 1.6.6
+- see http://www.wireshark.org/docs/relnotes/wireshark-1.6.6.html
+
 * Fri Mar  9 2012 Jan Safranek <jsafrane@redhat.com> - 1.6.5-2
 - fixed wireshark crashing when using combo box in import dialog (#773290)
 - added AES support into netlogon dissector
@@ -381,6 +385,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 - upgrade to 1.6.2
 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.2.html
 
+
 * Thu Jul 21 2011 Jan Safranek <jsafrane@redhat.com> - 1.6.1-1
 - upgrade to 1.6.1
 - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.1.html