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

svn path=/trunk/; revision=37789

2 files changed, 240 insertions, 5 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 42946e3147..ff49ef38ef 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2011-06-17)
+(last updated 2011-06-25)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -19063,8 +19063,8 @@ Decimal
       nathan.grant&trafficmaster.co.uk
 4768
   E.ON AG
-    Bernhard Erdmann
-      bernhard.erdmann&eon.com
+    Marco Thelen
+      marco.thelen&eon.com
 4769
   IBM Corporation
     Victor Sample
@@ -152267,6 +152267,238 @@ Decentralization / Helenic Public Administra
   LocalNet Corp.
     Ed Szynaka
       ln_eds&localnet.com
+38171
+  fischerwerke GmbH & Co. KG
+    Johannes Klumpp
+      admin-c&fischer.de
+38172
+  CustosMobile
+    Carlos Blanco
+      carlos.blanco&custosmobile.com
+38173
+  Adminia Sistemas
+    Javier Martín
+      sistemas&adminia.es
+38174
+  Hamilton Medical Center
+    Chad White
+      cwhite&hhcs.org
+38175
+  Dali Wireless, Inc.
+    Albert S. Lee
+      lee&daliwireless.com
+38176
+  Marken Mehrwert AG
+    Hajo Kliemeck
+      klk&kybeidos.de
+38177
+  iCue
+    Ashutosh Vighne
+      avighne&icue.biz
+38178
+  Skytide, Inc
+    Laxman Chinnakotla
+      lchinnakotla&skytide.com
+38179
+  Bard College
+    Damion Alexander
+      dalexand&bard.edu
+38180
+  Kangaroo Media Inc.
+    Pedro Costa
+      pcosta&kangaroo.tv
+38181
+  Trinity Health
+    Edward Trail
+      traile&trinity-health.org
+38182
+  CUBE. Corporate Release SA
+    Kamil Kurzyk
+      kkurzyk&cube-cr.pl
+38183
+  Pythagore FD
+    Frédéric Helmer
+      f.helmer&pythagore-fd.fr
+38184
+  Heidelberg Mobil International GmbH
+    Christian Zimmermann
+      christian.zimmermann&hdm-i.com
+38185
+  Detailresult Groep
+    J. van Leeuwen
+      jvleeuwen&detailresult.nl
+38186
+  Xpandia Ltd.
+    Ian S Gordon
+      ian&xpandia.co.uk
+38187
+  Weidmüller Interface GmbH & Co. KG
+    Sebastian Wolf
+      sebastian.wolf&weidmueller.de
+38188
+  StormMQ Limited
+    Raphael Cohn
+      raphael.cohn&stormmq.com
+38189
+  Telemedia LTD
+    Tamas Kanai
+      tamas.kanai&telemedia.hu
+38190
+  Magna
+    Tho Nguyen
+      Tho.Nguyen&magna.com
+38191
+  Memjet, Inc.
+    Bob Woods
+      bob.woods&memjet.com
+38192
+  Gravity R&D Limited
+    Gabor Vincze
+      administration&gravityrd.com
+38193
+  Yuduan Mobile Co., Ltd.
+    Xin Chen
+      hhuang&yuduanmobile.com
+38194
+  Naga Concept
+    Jean-Marc Houbiers
+      jmh&nagaconcept.com
+38195
+  Gameservers.com
+    Brian Rak
+      brak&gameservers.com
+38196
+  Flagship Facility Services
+    Jasmeet Sidhu
+      sidhu.j&gmail.com
+38197
+  Lacuna Systems, Inc.
+    Derek Andree
+      dandree&lacunasystems.com
+38198
+  Rincon Research Corporation
+    John Forinash
+      jmf&rincon.com
+38199
+  Fraser Talbot Consulting Services; L.L.C
+    Fraser Talbot
+      fraserhtalbot&ft-cs.com
+38200
+  Libéo
+    Jean-François Rousseau
+      info&libeo.com
+38201
+  Ronald Hummelink
+    Ronald Hummelink
+      ronald&hummelink.net
+38202
+  NETILITY GmbH & Co. KG
+    Arno Schenk
+      hostmaster&netility.de
+38203
+  Interactive Systems & Business Consulting
+    Aurel Chiriac
+      aurel.chiriac&intersystems.ro
+38204
+  Six DEE Telecom Solutions Pvt. Ltd.
+    Kenil Paul
+      kenilpaul&gmail.com
+38205
+  University Teleinformatic Center - UTIC, University of Sarajevo
+    Senad Burak
+      senad.burak&utic.net.ba
+38206
+  Eloquera
+    Dmytro Bablinyuk
+      dmytro&eloquera.com
+38207
+  Fujian JinQianMao Electronic Technology Co.,Ltd.
+    ROY HUANG
+      jqm&fjjqm.com
+38208
+  meaganharris.net
+    Meagan Harris
+      meagan&meaganharris.net
+38209
+  VMC Systems Ltd.
+    Abhijit Bhalekar
+      abhijit.b&vmcindia.com
+38210
+  Xovis AG
+    Markus Herrli
+      markus.herrli&xovis.com
+38211
+  JSC 'Siberian Coal Energy Company'
+    Pashkov Sergey
+      Pashkov&suek.ru
+38212
+  Derichebourg
+    Nikic Milan
+      hotline&derichebourg.com
+38213
+  ACCENT-ELECTRONIC
+    Alexander Mashtakov
+      amashtakov&accent.md
+38214
+  Vlatacom
+    Momčilo Majić
+      momcilo.majic&vlatacom.com
+38215
+  Hochschule Hamm-Lippstadt - University of Applied Sciences
+    Michael Steuter
+      michael.steuter&hshl.de
+38216
+  Blumenthal S.R.L.
+    Gion Blumenthal
+      gion&blumenthal.it
+38217
+  gigatec GmbH
+    Stephan A. Klein
+      servicedesk&gigatec.de
+38218
+  Designer Systems Ltd
+    David Ingleby-Oddy
+      david&designersystems.co.uk
+38219
+  Therap Services, LLC
+    Md. Nazrul Islam
+      nazrul&therapservices.net
+38220
+  IZAO Greenwall Systems
+    Kuznetsov Mikhail Alexandrovich
+      tech.support&greenwall.by
+38221
+  IP Gorshkov Yuri Valerevich
+    Yuri V. Gorshkov
+      yvgorshkov&gmail.com
+38222
+  Philips Electronics North America Corporation
+    Anthony Kandaya
+      anthony.kandaya&philips.com
+38223
+  definition six, inc.
+    Chris Hecker
+      support&d6.com
+38224
+  Caromont Health
+    Mike Johnson
+      johnsonm&caromonthealth.org
+38225
+  Encell Technology, Inc.
+    Gordon Hwang
+      ghwang&encell.com
+38226
+  AriadNEXT
+    Marc NORLAIN
+      marc.norlain&ariadnext.com
+38227
+  Wellington and King, Inc.
+    Charle Demers
+      cdemers&wellingtonking.com
+38228
+  PICA GmbH
+    Moritz Maier
+      moritz.maier&pica.de
 
 
 End of Document
diff --git a/services b/services
index c6ce10bf67..e3d112dcd9 100644
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 
 PORT NUMBERS
 
-(last updated 2011-06-13)
+(last updated 2011-06-23)
 
 The port numbers are divided into three ranges: the Well Known Ports,
 the Registered Ports, and the Dynamic and/or Private Ports.
@@ -8264,6 +8264,7 @@ tarantella	3144/udp   Tarantella
 csi-lfap	3145/tcp   CSI-LFAP
 csi-lfap	3145/udp   CSI-LFAP
 #			   Paul Amsden <amsden@.ctron.com>
+###UNAUTHORIZED USE: port 3145 by zftpserver#################
 bears-02        3146/tcp   bears-02
 bears-02        3146/udp   bears-02
 #                          Bruce McKinnon <brucemck&bearsolutions.com.au>
@@ -13399,7 +13400,9 @@ tal-pod         6149/udp   tal-pod
 efb-aci         6159/tcp   EFB Application Control Interface
 #                          Jonathan Schaaf <j.schaaf&astronautics.com> 10 February 2010
 #               6159/udp   Reserved
-#               6160       Unassigned 
+ecmp            6160/tcp   Emerson Extensible Control and Management Protocol
+ecmp-data       6160/udp   Emerson Extensible Control and Management Protocol Data
+#                          Bryce Beeston <bryce.beeston&emerson.com> 23 June 2011
 patrol-ism      6161/tcp   PATROL Internet Srv Mgr
 patrol-ism      6161/udp   PATROL Internet Srv Mgr
 patrol-coll     6162/tcp   PATROL Collector