Merge tcpdump-4.1.1.

1 files changed, 22 insertions, 5 deletions

diff --git a/contrib/tcpdump/CREDITS b/contrib/tcpdump/CREDITS
index b058d67..0a3b56e 100644
--- a/contrib/tcpdump/CREDITS
+++ b/contrib/tcpdump/CREDITS
@@ -27,6 +27,7 @@ Additional people who have contributed patches:
 	Ben Byer			<bushing at sourceforge dot net>
 	Atsushi Onoe			<onoe at netbsd dot org>
 	Ben Smithurst			<ben at scientia dot demon dot co dot uk>
+	Bert Vermeulen			<bert at biot dot com>
 	Bjoern A. Zeeb			<bzeeb at Zabbadoz dot NeT>
 	Brent L. Bates			<blbates at vigyan dot com>
 	Brian Ginsbach			<ginsbach at cray dot com>
@@ -44,11 +45,15 @@ Additional people who have contributed patches:
 	Daniel Hagerty 			<hag at ai dot mit dot edu>
 	Darren Reed			<darrenr at reed dot wattle dot id dot au>
 	David Binderman			<d dot binderman at virgin dot net>
+	David Horn			<dhorn2000 at gmail dot com>
 	David Smith			<dsmith at redhat dot com>
 	David Young			<dyoung at ojctech dot com>
 	Don Ebright			<Don dot Ebright at compuware dot com>
 	Eddie Kohler			<xexd at sourceforge dot net>
+	Elmar Kirchner			<elmar at juniper dot net>
+	Fang Wang			<fangwang at sourceforge dot net>
 	Florent Drouin			<Florent dot Drouin at alcatel-lucent dot fr>
+	Florian Forster			<octo at verplant dot org>
 	Francis Dupont			<Francis dot Dupont at enst-bretagne dot fr>
 	Francisco Matias Cuenca-Acuna	<mcuenca at george dot rutgers dot edu>
 	Francois-Xavier Le Bail		<fx dot lebail at yahoo dot com>
@@ -68,8 +73,10 @@ Additional people who have contributed patches:
 	Heinz-Ado Arnolds		<Ado dot Arnolds at dhm-systems dot de>
 	Hendrik Scholz			<hendrik at scholz dot net>
 	Ian McDonald			<imcdnzl at gmail dot com>
-        Jacek Tobiasz                   <Jacek dot Tobiasz at atm dot com dot pl>
+	Ilpo Järvinen			<ilpo dot jarvinen at helsinki dot fi>
+	Jacek Tobiasz			<Jacek dot Tobiasz at atm dot com dot pl>
 	Jakob Schlyter			<jakob at openbsd dot org>
+	Jamal Hadi Salim 		<hadi at cyberus dot ca>
 	Jan Oravec			<wsx at wsx6 dot net>
 	Jason R. Thorpe			<thorpej at netbsd dot org>
 	Jefferson Ogata 		<jogata at nodc dot noaa dot gov>
@@ -78,10 +85,12 @@ Additional people who have contributed patches:
 	Jim Hutchins			<jim at ca dot sandia dot gov>
         Jonathan Heusser                <jonny at drugphish dot ch>
 	Tatuya Jinmei			<jinmei at kame dot net>
+	João Medeiros			<ignotus21 at sourceforge dot net>
 	Joerg Mayer			<jmayer@loplof.de>
-	Jørgen Thomsen			<jth at jth dot net> 
+	Jørgen Thomsen			<jth at jth dot net> 
 	Julian Cowley			<julian at lava dot net>
 	Kaarthik Sivakumar		<kaarthik at torrentnet dot com>
+	Karl Norby			<karl-norby at sourceforge dot net>
 	Kazushi Sugyo			<sugyo at pb dot jp dot nec dot com>
 	Kelly Carmichael		<kcarmich at ipapp dot com>
 	Ken Hornstein			<kenh at cmf dot nrl dot navy dot mil>
@@ -92,7 +101,8 @@ Additional people who have contributed patches:
 	Larry Lile			<lile at stdio dot com>
 	Lennert Buytenhek 		<buytenh at gnu dot org>
 	Loris Degioanni			<loris at netgroup-serv dot polito dot it>
-	Love Hörnquist-Åstrand		<lha at stacken dot kth dot se>
+	Love Hörnquist-Åstrand		<lha at stacken dot kth dot se>
+	Lucas C. Villa Real		<lucasvr at us dot ibm dot com>
 	Luis Martin Garcia		<luis dot mgarc at gmail dot com>
 	Maciej W. Rozycki		<macro at ds2 dot pg dot gda dot pl>
 	Manu Pathak			<mapathak at cisco dot com>
@@ -100,12 +110,13 @@ Additional people who have contributed patches:
 	Marc A. Lehmann			<pcg at goof dot com>
 	Mark Ellzey Thomas		<mark at ackers dot net>
 	Marko Kiiskila			<carnil at cs dot tut dot fi>
-	Markus Schöpflin		<schoepflin at sourceforge dot net>
+	Markus Schöpflin		<schoepflin at sourceforge dot net>
 	Marshall Rose			<mrose at dbc dot mtview dot ca dot us>
 	Martin Husemann			<martin at netbsd dot org>
 	Max Laier			<max at love2party dot net>
 	Michael A. Meffie III		<meffie at sourceforge dot net>
 	Michael Madore			<mmadore at turbolinux dot com>
+	Michael Riepe			<too-tired at sourceforge dot net>
 	Michael Shalayeff		<mickey at openbsd dot org>
 	Michael Shields			<shields at msrl dot com>
 	Michael T. Stolarchuk		<mts at off dot to>
@@ -132,13 +143,16 @@ Additional people who have contributed patches:
 	Peter Fales			<peter at fales-lorenz dot net>
 	Peter Jeremy			<peter dot jeremy at alcatel dot com dot au>
 					<pfhunt at users dot sourceforge dot net>
+	Peter Volkov			<pva at gentoo dot org>
 	Phil Wood			<cpw at lanl dot gov>
 	Rafal Maszkowski		<rzm at icm dot edu dot pl>
+	Randy Sofia			<rsofia at users dot sourceforge dot net>
 	Raphael Raimbault		<raphael dot raimbault at netasq dot com>
 	Rick Cheng                      <rcheng at juniper dot net>
 	Rick Jones			<rick dot jones2 at hp dot com>
 	Rick Watson			<watsonrick at users dot sourceforge dot net>
 	Rob Braun			<bbraun at synack dot net>
+	Robert Edmonds			<stu-42 at sourceforge dot net>
 	Roderick Schertler		<roderick at argon dot org>
 	Sagun Shakya			<sagun dot shakya at sun dot com>
 	Sami Farin			<safari at iki dot fi>
@@ -155,11 +169,14 @@ Additional people who have contributed patches:
 	Terry Kennedy			<terry at tmk dot com>
 	Timo Koskiahde
 	Tony Li				<tli at procket dot com>
+	Toshihiro Kanda			<candy at fct dot kgc dot co dot jp>
 	Uns Lider			<unslider at miranda dot org>
 	Victor Oppleman			<oppleman at users dot sourceforge dot net>
 	Wesley Griffin			<wgriffin at users dot sourceforge dot net>
+	Wesley Shields			<wxs at FreeBSD dot org>
 	Wilbert de Graaf		<wilbertdg at hetnet dot nl>
-        Will Drewry                     <will at alum dot bu dot edu>
+	Will Drewry			<will at alum dot bu dot edu>
+	William J. Hulley		<bill dot hulley at gmail dot com>
 	Yen Yen Lim
 	Yoshifumi Nishida