[wireshark/f17: 16/16] Merge branch 'f16' into f17

[Jan Šafránek]

commit 5c210bc69ce9285cd241fcb8166ee5961067c22a
Merge: 6809a52 98f8536
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Wed Mar 28 09:41:07 2012 +0200

    Merge branch 'f16' into f17
    
    Conflicts:
    	.gitignore
    	sources
    	wireshark.spec

 .gitignore     |    1 +
 sources        |    2 +-
 wireshark.spec |    7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc wireshark.spec
index 7330e9b,aaa0e3f..3c7f9dc
--- a/wireshark.spec
+++ b/wireshark.spec
@@@ -10,8 -10,8 +10,8 @@@
  
  Summary:	Network traffic analyzer
  Name:		wireshark
- Version:	1.6.5
+ Version:	1.6.6
 -Release:	1%{?dist}
 +Release:	2%{?dist}
  License:	GPL+
  Group:		Applications/Internet
  Source0:	http://wireshark.org/download/src/%{name}-%{version}.tar.bz2
@@@ -381,6 -377,6 +385,7 @@@ gtk-update-icon-cache %{_datadir}/icons
  - upgrade to 1.6.2
  - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.2.html
  
++
  * Thu Jul 21 2011 Jan Safranek <jsafrane at redhat.com> - 1.6.1-1
  - upgrade to 1.6.1
  - see http://www.wireshark.org/docs/relnotes/wireshark-1.6.1.html