[wireshark/f14/master: 5/5] Merge master changes

[Jan Šafránek]

commit b1314234a31c7e0a6e01e6e7b62a94d058f12a67
Merge: 2d354fb d919ea1
Author: Jan Safranek <jsafrane at redhat.com>
Date:   Fri Oct 22 12:07:42 2010 +0200

    Merge master changes

 wireshark.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc wireshark.spec
index 648a145,a594fed..fa85a21
--- a/wireshark.spec
+++ b/wireshark.spec
@@@ -323,12 -291,9 +323,15 @@@ f
  %{_sbindir}/idl2wrs
  
  %changelog
 +* Fri Oct 22 2010 Jan Safranek <jsafrane at redhat.com> - 1.4.1-1
 +- upgrade to 1.4.1
 +- see http://www.wireshark.org/docs/relnotes/wireshark-1.4.1.html
 +- Own the %%{_libdir}/wireshark dir (#644508)
 +- associate *.pcap files with wireshark (#641163)
 +
+ * Tue Oct 05 2010 jkeating - 1.4.0-2.1
+ - Rebuilt for gcc bug 634757
+ 
  * Fri Sep 24 2010 Jan Safranek <jsafrane at redhat.com> - 1.4.0-2
  - fixed generation of man pages (#635878)