[Automatic manuf, services and enterprise-numbers update for 2011-06-19]

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37708 f5534014-38df-0310-8fa8-9805f1628bb7

2 files changed, 270 insertions, 9 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 2d9929e9d4..42946e3147 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2011-06-10)
+(last updated 2011-06-17)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -58845,7 +58845,7 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
 14822
   FaJo.de
     Falk John
-      admin&fajo.de
+      falk.john&fajo.de
 14823
   Aruba Networks Inc
     Ravi Mulam
@@ -84364,7 +84364,7 @@ Information Security of Pr
     James Moore
       Jim&linuma.net
 21202
-  BT (Germany)
+  BT (Germany) GmbH & Co. oHG
     Falk John
       falk.john&bt.com
 21203
@@ -138940,7 +138940,7 @@ Decentralization / Helenic Public Administra
       louie.wong&innov8scada.com
 34839
   abakus IT AG
-    Stephan Hardtmann
+    Peter Fischer
       pki&abakus.de
 34840
   Shanghai Huaheng Telecom Equipment Co.,Ltd
@@ -149353,7 +149353,7 @@ Decentralization / Helenic Public Administra
       frans.ortmans&ocinitrogen.com
 37442
   ANF Authority of Certification Ecuador, S.A.
-    Isabel Fàbregas
+    Florencio Diaz
       fdiaz&anf.es
 37443
   Centina Systems
@@ -151566,7 +151566,7 @@ Decentralization / Helenic Public Administra
 37995
   Initiative für Netzfreiheit
     Leonhard Preis
-      leonhard.preis&gmx.net
+      technik&netzfreiheit.org
 37996
   KTS GmbH
     Gregor Kotyrba
@@ -151933,7 +151933,7 @@ Decentralization / Helenic Public Administra
       noc.nz&kordia.co.nz
 38087
   Real I.T. Technicians, LLC
-    David Rufrano
+    Victor Centross
       contact&realittechs.com
 38088
   Joshua Tree Software, LLC
@@ -152011,6 +152011,262 @@ Decentralization / Helenic Public Administra
   Nebraska Furniture Mart, Inc.
     Thomas Applebee
       tom.applebee&nfm.com
+38107
+  Aviosys Inc.
+    Albert Liu
+      albert&aviosys.com
+38108
+  MicroXel Networks, Inc.
+    Fred Mo
+      fred.mo&microxel.com
+38109
+  Domtar
+    Marc Mathieu
+      marc.mathieu&domtar.com
+38110
+  Arkivum Ltd
+    Richard Lowe
+      Richard.Lowe&arkivum.com
+38111
+  SHENZHEN DINSTAR TECHNOLOGIES Co.,Ltd.
+    Jin Rong,Zhong
+      zjrtx530&126.com
+38112
+  Wuxi ZhongXun Technology Co.,ltd.
+    yedaoliang
+      yedaoliang&163.com
+38113
+  Red Lion Controls Inc.
+    Paul Marsh
+      paulm&redlion.net
+38114
+  Merseytravel
+    Mark Evans
+      mark.evans&merseytravel.gov.uk
+38115
+  Marist College
+    Server Administrator
+      server.admins&marist.edu
+38116
+  ClearBUS
+    Jean-Marc Lefebvre
+      jean-marc.lefebvre&clearbus.fr
+38117
+  University College Dublin
+    John Curran
+      security&ucd.ie
+38118
+  BEI Electronics LLC
+    Ron Marks
+      pen&bdcast.com
+38119
+  Open Mobile Video Coalition
+    Anne Schelle
+      anne.schelle&omvc.org
+38120
+  UMass Memorial Medical Center
+    Lorena Mandozzi
+      lorena.mandozzi&umassmemorial.org
+38121
+  IOD Incorporated.com
+    Lenny Dexter
+      ldexter&iodincorporated.com
+38122
+  Red Wire Services, LLC
+    Nick Webb
+      nickw&redwireservices.com
+38123
+  kinkajougames
+    juan pablo gaviria
+      juanpablo&kinkajougames.com
+38124
+  Thomson Video Networks
+    Patrick Gendron
+      patrick.gendron&thomson-networks.com
+38125
+  EuroDNS SA
+    Xavier Buck
+      icann&eurodns.com
+38126
+  COGITOP SAS
+    VIVERET Jean-Marie
+      jm.viveret&cogitop.fr
+38127
+  IES Doctor Balmis
+    Eduardo Barredo
+      eduardo&iesdoctorbalmis.com
+38128
+  Laurentian University
+    Marty Laferriere
+      mlaferriere&laurentian.ca
+38129
+  Akumen LTD
+    Istvan Csaky
+      csaky&akuware.com
+38130
+  Faith Regional Health Services
+    Kim Stinson
+      kstinson&frhs.org
+38131
+  RG Nets
+    Nick Rogers
+      ncr&rgnets.com
+38132
+  eTruhla s.r.o.
+    Vit Hnilica
+      info&etruhla.cz
+38133
+  Ingnitia http://www.ingnitia.com
+    Mikel Mugarza
+      mmugarza&gmail.com
+38134
+  National Document Custodians, LLC
+    Albert Wheeler
+      devadmin&documentcustodians.com
+38135
+  Shield Bridge Inc.
+    William Bai
+      wbai&thebais.com
+38136
+  In Touch Pharmaceuticals, Inc
+    Mitch Gaffigan
+      mitch&intouchpharma.com
+38137
+  Fusionskye
+    Wang Yong
+      wangyong&fusionskye.com
+38138
+  Hochschule Regensburg
+    Athanassios Tsakpinis
+      athanassios.tsakpinis&hs-regensburg.de
+38139
+  pro parity IT-Service
+    Dominik George
+      info&proparity.de
+38140
+  Imtech Marine
+    Pascual de la Cruz
+      pascual.delacruz&imtech.nl
+38141
+  Emich KsE - Kundenspezifische Elektronik
+    Marc Emich
+      info&emich-kse.de
+38142
+  BHE Bonn Hungary Electronics Ltd.
+    Gyula Mikó
+      gyula.miko&bhe-mw.eu
+38143
+  CloudBees, Inc.
+    Kohsuke Kawaguchi
+      kkawaguchi&cloudbees.com
+38144
+  ZBD Displays Limited
+    Greg Beresford
+      greg.beresford&zbdsolutions.com
+38145
+  ECG, Inc.
+    James Puckett
+      jpuckett&e-c-group.com
+38146
+  Access Now
+    Daniel Bryg
+      dbryg&yahoo.com
+38147
+  Mind Matters LLC
+    Deepa Abraham PhD
+      mobileofficepro&att.net
+38148
+  EMCALI E.I.C.E. E.S.P.
+    David Blandon Romaña
+      dblandon&emcali.net.co
+38149
+  Teknokala Ky
+    Timo Santasalo
+      timo.santasalo&teknokala.com
+38150
+  Altia Consultores S.A.
+    Luis Alberto Asturias Núñez
+      luis.asturias&altia.es
+38151
+  Invendis Technologies
+    Devashis Sahoo
+      devashis.sahoo&invendis.com
+38152
+  Bauerfeind AG
+    Daniel Scharf
+      daniel.scharf&bauerfeind.com
+38153
+  Dada S.p.A.
+    Fabio Coatti
+      sistemi&dada.net
+38154
+  Autopart International, Inc.
+    James Russell
+      it&autopartintl.com
+38155
+  EXATEQ Ltd.
+    Mark Fidell
+      mark.fidell&exateq.com
+38156
+  Zepheira LLC
+    Zepheira PEN Contact
+      iana.pen&zepheira.com
+38157
+  Policìa Nacional de Colombìa
+    Natalia Andrea beltran
+      natalia.beltran&policia.gov.co
+38158
+  Open Platform Trust Services
+    Seiji Munetoh
+      seiji.munetoh&gmail.com
+38159
+  Unity Global Corporation
+    Pamela Turner
+      turner&unityglobalcorporation.com
+38160
+  Datto Inc.
+    Dan Fuhry
+      dfuhry&dattobackup.com
+38161
+  W.W. Grainger, Inc.
+    Eleazar Flores
+      eleazar.flores&grainger.com
+38162
+  BNTPRO BILGI ve ILETISIM HIZ. LTD. STI.
+    Fatih BATUM
+      fatih&bntpro.com
+38163
+  Kiesel GmbH
+    Andrease Imhof
+      it&kiesel.net
+38164
+  Ticket Monster Inc
+    Doo Han Yoon
+      sys&tmon.co.kr
+38165
+  Kohlpharma GmbH
+    Imonikhe Imonah
+      iimonah&kohlpharma.com
+38166
+  nexurium.fr
+    Joly Bastien
+      joly.bastien&gmail.com
+38167
+  Albrecht Jung GmbH & Co. KG
+    André Paul
+      iana_admin&jung.de
+38168
+  The Taubman Company
+    Quang Nguyen
+      qnguyen&taubman.com
+38169
+  Life Image Inc
+    Hai Wang
+      hwang&lifeimage.com
+38170
+  LocalNet Corp.
+    Ed Szynaka
+      ln_eds&localnet.com
 
 
 End of Document
diff --git a/services b/services
index 15ed401a98..c6ce10bf67 100644
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 
 PORT NUMBERS
 
-(last updated 2011-06-10)
+(last updated 2011-06-13)
 
 The port numbers are divided into three ranges: the Well Known Ports,
 the Registered Ports, and the Dynamic and/or Private Ports.
@@ -13012,7 +13012,10 @@ ncxcp 		5681/udp   Net-coneX Control Protocol
 #               5682/tcp   Reserved
 brightcore      5682/udp   BrightCore control & data transfer exchange
 #                          Marko Bjelac <marko.bjelac&elma.hr> 10 June 2010
-#               5683-5687  Unassigned
+#               5683/tcp   Reserved
+coap            5683/udp   Constrained Application Protocol
+#                          [I-D.ietf-core-coap] 13 June 2011
+#               5684-5687  Unassigned
 ggz             5688/tcp   GGZ Gaming Zone
 ggz             5688/udp   GGZ Gaming Zone
 #                          Josef Spillner <admin&ggzgamingzone.org> January 2003  
@@ -17273,5 +17276,7 @@ References
             S. Wadhwa, J. Moisand, T. Haag, N. Voigt, T. Taylor, Ed., "Protocol for 
             Access Node Control Mechanism in Broadband Networks", RFC XXXX, Month Year.
 
+[I-D.ietf-core-coap] (work in process)
+
 []