Eliminate some duplicate entries. If the e-mail addresses are the same,

it's an obvious duplicate; if the addresses are in the same domain, it's
almost certainly a duplicate; if the addresses are in different domains,
but one company bought some of the product line for another company, we
assume it's a duplicate (e.g., we presume Martijn Schipper moved from
Intersil to GlobespanVirata when Intersil sold the PRISM 802.11 chipset
lines to GlobespanVirata, although he now appears to be at Magna Carta).

This still leaves Joost Yervante Damad, Thomas Dreibholz, and Thomas
Palmer as duplicates - probably the same people, but I'll ask The Great
Gazoogle a few questions first.

svn path=/trunk/; revision=28631

AUTHORS

@@ -911,8 +911,9 @@ Steve Dickson           <steved[AT]talarian.com> {
 	PGM (Pragmatic General Multicast) support
 }
 
-Markus Seehofer         <mseehofe[AT]nt.hirschmann.de> {
+Markus Seehofer         <Markus.Seehofer [AT] hirschmann.de> {
 	GMRP support
+	IEEE 1588 / PTP version 2 support
 }
 
 Lee Berger              <lberger[AT]roy.org> {
@@ -1753,8 +1754,10 @@ Teemu Rinta-aho         <teemu.rinta-aho [AT] nomadiclab.com> {
 	Draft 20 MIPv6 support
 }
 
-Martijn Schipper        <martijn.schipper [AT] intersil.com> {
+Martijn Schipper        <mschipper [AT] globespanvirata.com> {
 	Fix for tag for 802.11g ERP Information field
+	Support for reading AiroPeek files in V9 capture file format
+	(AiroPeek 2.x)
 }
 
 Wayne Parrott           <wayne_p [AT] pacific.net.au> {
@@ -2051,11 +2054,6 @@ David Fort              <david.fort [AT] irisa.fr> {
 	DNS IPSECKEY RR support
 }
 
-Martijn Schipper        <mschipper [AT] globespanvirata.com> {
-	Support for reading AiroPeek files in V9 capture file format
-	(AiroPeek 2.x)
-}
-
 Felix Fei               <felix.fei [AT] utstar.com> {
 	GSM MAP support
 }
@@ -2957,7 +2955,6 @@ Tomasz Mrugalski	<thomson [AT] klub.com.pl>
 Brett Kuskie		<mstrprgmmr [AT] chek.com>
 Brian Caswell		<bmc [AT] sourcefire.com>
 Yann			<yann_eads [AT] hotmail.com>
-Jon Ringle		<ml-ethereal [AT] ringle.org>
 Julien Leproust		<julien [AT] via.ecp.fr>
 Mutsuya Irie		<irie [AT] sakura-catv.ne.jp>
 Yoshihiro Oyama		<y.oyama [AT] netagent.co.jp>
@@ -2986,7 +2983,6 @@ Maria-Luiza Crivat	<luizacri [AT] gmail.com>
 Brice Augustin		<bricecotte [AT] gmail.com>
 Matt Thornton		<MATT_THORNTON [AT] appsig.com>
 Markus Seehofer		<Markus.Seehofer [AT] hirschmann.de>
-Matthias Drochner	<M.Drochner [AT] fz-juelich.de>
 Timo Metsala		<timo.metsala [AT] gmail.com>
 Tomer Shani		<thetour [AT} japan.com>
 Manu Pathak		<mapathak [AT] cisco.com>