[Automatic manuf and enterprise-numbers update for 2010-06-13]

svn path=/trunk-1.0/; revision=33216

2 files changed, 198 insertions, 13 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index e6f7002037..cba13bfc7a 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2010-06-05)
+(last updated 2010-06-12)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -12848,7 +12848,7 @@ Decimal
 3210
   VOLKSWAGEN AG
     Andreas Krengel
-      andreas.krengel&volkswagen.de
+      penmaster&volkswagen.de
 3211
   Allgon AB
     Hakan Grenabo
@@ -117762,9 +117762,9 @@ Decentralization / Helenic Public Administra
     Abazovic Dejan
       dejoa&cg.ac.yu
 29545
-  EDV-Service Schatz
+  Open Source Business Group
     Stefan Schatz
-      s.schatz&stsedv.com
+      office&osbg.at
 29546
   Soft- & Hardware Beratung Ebeling
     Jörg Ebeling
@@ -123649,7 +123649,7 @@ Decentralization / Helenic Public Administra
 31016
   Socrata, Inc.
     Paul Paradise
-      oid-master&blist.com
+      oid-master&socrata.com
 31017
   tele.sjb.partners AG
     Thomas Bach
@@ -125391,9 +125391,9 @@ Decentralization / Helenic Public Administra
     Thomas-Michael Domschke
       th.domschke&ipado.eu
 31452
-  VS Technology
+  VS Information Systems
     Vlastimil Setka
-      setka&seznam.cz
+      setka&vsis.cz
 31453
   Zyrion Inc.
     Rajib Rashid
@@ -138906,7 +138906,7 @@ Decentralization / Helenic Public Administra
 34830
   Forers, s. r. o.
     Petr Kutalek
-      petr&kutalek.cz
+      info&forers.cz
 34831
   The Freecycle Network
     Deron Beal / Richard Wallman
@@ -142939,7 +142939,7 @@ Decentralization / Helenic Public Administra
 35838
   Matrixx Software Inc.
     Luther Kitahata
-      Luther.Kitahata&MatrixxSw.com
+      sysadmin&MatrixxSw.com
 35839
   Imagine One Technology & Management
     Jeffrey Farmer
@@ -143282,7 +143282,7 @@ Decentralization / Helenic Public Administra
       oodujebe&enthusiaconsulting.com
 35924
   IET-International Empire Traders
-    Abdullah Salauddin
+    Syed Wali Hasan Zaidi, Abdullah Salauddin
       projects&iet-group.com
 35925
   Warsaw Stock Exchange
@@ -143352,6 +143352,162 @@ Decentralization / Helenic Public Administra
   Mitsubishi UFJ Securities (USA), Inc.
     Kazutaka Abe
       kabe&us.sc.mufg.jp
+35942
+  Uralchem
+    Dmitry Ponomarev
+      dmitry.ponomarev&uralchem.com
+35943
+  Boerse Stuttgart
+    Samir Gaertner
+      systembetrieb&boerse-stuttgart.de
+35944
+  Selecom
+    Olivier Deblock
+      odeblock&selecom.fr
+35945
+  Swid
+    Stephane Morucci
+      contact&swid.fr
+35946
+  SMG Co., Ltd.
+    Nobuyuki Maki
+      maki&smg.co.jp
+35947
+  SME Soluciones
+    Antonio Aragón
+      sme-soluciones&sme-soluciones.com
+35948
+  Phoneytunes.com
+    Manish Nema
+      manish.nema&phoneytunes.com
+35949
+  Vienna Symphonic Library GmbH
+    Bernd Mazagg
+      register&vsl.co.at
+35950
+  eFolder, Inc.
+    Peter Samuelson
+      psamuelson&efolder.net
+35951
+  XConnect Global Networks
+    David Schwartz
+      dschwartz&xconnect.net
+35952
+  Sleevewerks BV
+    Hans Verbrugge
+      netmaster&sleevewerks.nl
+35953
+  Chargetek, Inc.
+    Ray Goodrich
+      ray&chargetek.com
+35954
+  VOD Pty Ltd
+    Van Lisowski
+      vl&vod.net.au
+35955
+  Niigata University
+    Kenji Mikawa
+      mikawa&cais.niigata-u.ac.jp
+35956
+  china wing technologies co.,ltd.
+    wyvern wang
+      wyvernw&139.com
+35957
+  Donjin Communication Technology Co.Ltd
+    Deepanker Tamta
+      deepanker.tamta&donjin.com
+35958
+  Vedekon
+    Mikhail Zaitsev
+      mz&vedekon.net
+35959
+  TECHWAY S.A.S
+    Elodie RIGAUDIERE
+      support&techway.fr
+35960
+  Drotposta Consulting Ltd
+    Geza Simon
+      sngeza&freemail.hu
+35961
+  Christian Arnold
+    Christian Arnold
+      christian&arnold.schlittermann.de
+35962
+  Pumpkin　Heads Co.,Ltd.
+    Shoichiro Sakaigawa
+      nwadmin&pumpkinheads.jp
+35963
+  k12 ITC, Inc.
+    Brad Sandt
+      sandtb&k12itc.com
+35964
+  BeiJing CS&S HuaTech Info Tech Ltd
+    LiYingyu
+      yingyu_li_7&163.com
+35965
+  Control Risks Group Ltd
+    Michael Cherry
+      Mike.Cherry&control-risks.com
+35966
+  MBDA Italia SPA
+    Matteo Calabrese
+      matteo.calabrese&mbda.it
+35967
+  AutoZone
+    Stephen Agar
+      irm.infosec&autozone.com
+35968
+  TrustFabric
+    Joe Botha
+      joe&trustfabric.org
+35969
+  Vidyo, Inc.
+    Adi Regev
+      adi&vidyo.com
+35970
+  Planetsgroup
+    Edvin Gacina
+      egacina&planetsgroup.com
+35971
+  Zaha Hadid Architects
+    Simon Johns
+      james.waite&zaha-hadid.com
+35972
+  Audaxis S.A.
+    Eric Fesler
+      eric&audaxis.com
+35973
+  Fenazari
+    Stefan Rådström
+      admin&fenazari.se
+35974
+  SnmpSoft Company
+    Sergey Turlachev
+      company&snmpsoft.com
+35975
+  Healthsense, Inc.
+    Dan Vatland
+      dan.vatland&healthsense.com
+35976
+  Herrmann EDV-Beratung
+    Sascha Herrmann
+      oid-reg&nvbi.de
+35977
+  Reddog Chili
+    David C. Biediger
+      david.biediger&gmail.com
+35978
+  Clearleap, Inc.
+    Omar DeLara
+      odelara&clearleap.com
+35979
+  Gonow Tecnologia
+    Rodrigo F. Trevisan
+      rodrigo.trevisan&gonow.com.br
+35980
+  vMonitor LLC
+    Raed Abdallah
+      raed&vmonitor.com
 
 
 End of Document
diff --git a/manuf b/manuf
index 58a809d7c8..1215f8f385 100644
--- a/manuf
+++ b/manuf
@@ -1549,7 +1549,7 @@
 00:05:D8	Arescom                # Arescom, Inc.
 00:05:D9	TechnoVall             # Techno Valley, Inc.
 00:05:DA	ApexAutoma             # Apex Automationstechnik
-00:05:DB	NentecNetz             # NENTEC Netzwerktechnologie GmbH
+00:05:DB	PsiNentec              # PSI Nentec GmbH
 00:05:DC	Cisco                  # Cisco Systems, Inc.
 00:05:DD	Cisco                  # Cisco Systems, Inc.
 00:05:DE	GiFoneKore             # Gi Fone Korea, Inc.
@@ -2584,7 +2584,7 @@
 00:0A:0A	Sunix                  # SUNIX Co., Ltd.
 00:0A:0B	Sealevel               # Sealevel Systems, Inc.
 00:0A:0C	Scientific             # Scientific Research Corporation
-00:0A:0D	Mergeoptic             # MergeOptics GmbH
+00:0A:0D	FciDeutsch             # FCI Deutschland GmbH
 00:0A:0E	InvivoRese             # Invivo Research Inc.
 00:0A:0F	IlryungTel             # Ilryung Telesys, Inc
 00:0A:10	FastMediaI             # FAST media integrations AG
@@ -5303,7 +5303,7 @@
 00:14:AA	AshlyAudio             # Ashly Audio, Inc.
 00:14:AB	SenhaiElec             # Senhai Electronic Technology Co., Ltd.
 00:14:AC	BountifulW             # Bountiful WiFi
-00:14:AD	GassnerWie             # Gassner Wiege- u. Meßtechnik GmbH
+00:14:AD	GassnerWie             # Gassner Wiege- u. Meßtechnik GmbH
 00:14:AE	Wizlogics              # Wizlogics Co., Ltd.
 00:14:AF	Datasym                # Datasym Inc.
 00:14:B0	NaeilCommu             # Naeil Community
@@ -10278,6 +10278,7 @@
 00:30:FD	Integrated             # INTEGRATED SYSTEMS DESIGN
 00:30:FE	Dsa                    # DSA GmbH
 00:30:FF	Datafab                # DATAFAB SYSTEMS, INC.
+00:33:6C	Synapsense             # SynapSense Corporation
 00:35:32	Electro-Me             # Electro-Metrics Corporation
 00:3A:98	Cisco                  # Cisco Systems
 00:3A:99	Cisco                  # Cisco Systems
@@ -13955,6 +13956,11 @@
 00:50:C2:CA:A0:00/36	DspDesign              # DSP DESIGN LTD
 00:50:C2:CA:B0:00/36	SaeIt-Syst             # SAE IT-systems GmbH & Co. KG
 00:50:C2:CA:C0:00/36	Purvis                 # PURVIS Systems Incorporated
+00:50:C2:CA:D0:00/36	PacificCoa             # Pacific Coast Engineering
+00:50:C2:CA:E0:00/36	CampbellSc             # Campbell Scientific Canada Corp.
+00:50:C2:CA:F0:00/36	FrSauter               # Fr. Sauter AG
+00:50:C2:CB:00:00/36	KonsmetalS             # Konsmetal S.A.
+00:50:C2:CB:10:00/36	ZkCelltest             # ZK Celltest Inc
 00:50:C4	Imd
 00:50:C5	AdsTechnol             # ADS Technologies, Inc
 00:50:C6	LoopTeleco             # LOOP TELECOMMUNICATION INTERNATIONAL, INC.
@@ -14527,6 +14533,7 @@
 00:80:FD	ExsceedCor             # EXSCEED CORPRATION
 00:80:FE	AzureTechn             # AZURE TECHNOLOGIES, INC.
 00:80:FF	SocDeTelei             # SOC. DE TELEINFORMATIQUE RTC
+00:8C:10	BlackBox               # Black Box Corp.
 00:8C:FA	Inventec               # Inventec Corporation
 00:90:00	DiamondMul             # DIAMOND MULTIMEDIA
 00:90:01	NishimuEle             # NISHIMU ELECTRONICS INDUSTRIES CO., LTD.
@@ -15878,6 +15885,7 @@
 00:E0:FE	Cisco                  # CISCO SYSTEMS, INC.
 00:E0:FF	SecurityDy             # SECURITY DYNAMICS TECHNOLOGIES, Inc.
 00:E6:D3	NixdorfCom             # NIXDORF COMPUTER CORP.
+00:F8:60	PtPanggung             # PT. Panggung Electric Citrabuana
 01:0E:CF	PN-MC		# PROFINET Multicast
 02:04:06	BbnInterna             # BBN				internal usage (not registered)
 02:07:01	Racal-Data             # RACAL-DATACOM
@@ -16105,7 +16113,9 @@
 10:00:E0	AppleA/UxM             # Apple A/UX			(modified addresses for licensing)
 10:00:E8	NationalSe             # NATIONAL SEMICONDUCTOR
 10:09:0C	JanomeSewi             # Janome Sewing Machine Co., Ltd.
+10:0C:24	Pomdevices             # pomdevices, LLC
 10:0D:32	Embedian               # Embedian, Inc.
+10:0E:2B	NecCasioMo             # NEC CASIO Mobile Communications
 10:10:B6	Mccain                 # McCain Inc
 10:18:9E	ElmoMotion             # Elmo Motion Control
 10:2D:96	Looxcie                # Looxcie Inc.
@@ -16164,6 +16174,7 @@
 20:6A:FF	AtlasElekt             # Atlas Elektronik UK Limited
 20:6F:EC	BraemacCaL             # Braemac CA LLC
 20:7C:8F	QuantaMicr             # Quanta Microsystems,Inc.
+20:A2:E7	Lee-Dicken             # Lee-Dickens Ltd
 20:B0:F7	Enclustra              # Enclustra GmbH
 20:BF:DB	Dvl
 20:CF:30	AsustekCom             # ASUSTek COMPUTER INC.
@@ -16209,6 +16220,7 @@
 2C:A8:35	Rim
 2C:CD:27	Precor                 # Precor Inc
 2C:CD:43	SummitTech             # Summit Technology Group
+2C:D1:DA	Sanjole                # Sanjole, Inc.
 2E:2E:2E	LaaLocally             # LAA (Locally Administered Address) for Meditech Systems
 30:18:CF	DeosContro             # DEOS control systems GmbH
 30:32:D4	Hanilstm               # Hanilstm Co., Ltd.
@@ -16237,6 +16249,7 @@
 34:F3:9B	Wizlan                 # WizLAN Ltd.
 34:F9:68	AtekProduc             # ATEK Products, LLC
 38:0A:0A	Sky-CityCo             # Sky-City Communication and Electronics Limited Company
+38:0D:D4	PrimaxElec             # Primax Electronics LTD.
 38:22:9D	PirelliBro             # PIRELLI BROADBAND SOLUTIONS 
 38:52:1A	Alcatel-Lu             # Alcatel-Lucent 7705
 38:58:0C	Panaccess              # Panaccess Systems GmbH
@@ -16302,6 +16315,7 @@
 44:56:8D	PncTechnol             # PNC Technologies  Co., Ltd.
 44:56:B7	SpawnLabs              # Spawn Labs, Inc
 44:58:29	CiscoSpvtg             # Cisco SPVTG
+44:5E:F3	TonaliteHo             # Tonalite Holding B.V.
 44:61:32	Ecobee                 # ecobee inc
 44:6C:24	ReallinEle             # Reallin Electronic Co.,Ltd
 44:7C:7F	InnolightT             # Innolight Technology Corporation
@@ -16392,6 +16406,7 @@
 58:DB:8D	Fast                   # Fast Co., Ltd.
 58:E7:47	Deltanet               # Deltanet AG
 58:F6:7B	XiaMenUnio             # Xia Men UnionCore Technology LTD.
+58:F6:BF	KyotoUnive             # Kyoto University
 58:FD:20	BravidaSak             # Bravida Sakerhet AB
 5C:0E:8B	Motorola
 5C:14:37	Thyssenkru             # Thyssenkrupp Aufzugswerke GmbH
@@ -16458,6 +16473,7 @@
 68:AA:D2	Datecs                 # DATECS LTD.,
 68:CA:00	Octopus                # Octopus Systems Limited
 68:CC:9C	MineSiteTe             # Mine Site Technologies
+68:DB:96	OpwillTech             # OPWILL Technologies CO .,LTD
 68:E4:1F	UnglaubeId             # Unglaube Identech GmbH
 68:EB:AE	SamsungEle             # Samsung Electronics Co.,Ltd
 68:EF:BD	Cisco                  # Cisco Systems
@@ -16482,6 +16498,7 @@
 6C:BE:E9	Alcatel-Lu             # Alcatel-Lucent-IPD
 6C:D6:8A	LgElectron             # LG Electronics Inc
 6C:DC:6A	Promethean             # Promethean Limited
+6C:E0:B0	Sound4
 6C:F0:49	Giga-ByteT             # GIGA-BYTE TECHNOLOGY CO.,LTD.
 6C:FD:B9	ProwareTec             # Proware Technologies Co Ltd.
 6C:FF:BE	MpbCommuni             # MPB Communications Inc.
@@ -16559,6 +16576,7 @@
 7C:7B:E4	Z'Seda             # Z'SEDAI KENKYUSHO CORPORATION
 7C:A2:9B	DSignt&Amp             # D.SignT GmbH & Co. KG
 7C:BB:6F	CoscoElect             # Cosco Electronics Co., Ltd.
+7C:C5:37	Apple
 7C:CB:0D	AaxeonTech             # Aaxeon Technologies Inc.
 7C:CF:CF	ShanghaiSe             # Shanghai SEARI Intelligent System Co., Ltd
 7C:E0:44	Neon                   # NEON Inc
@@ -16624,6 +16642,7 @@
 8C:92:36	AusLinxTec             # Aus.Linx Technology Co., Ltd.
 8C:A9:82	IntelCorpo             # Intel Corporate
 8C:D6:28	IkorMeteri             # Ikor Metering
+8C:DD:8D	Wifly-City             # Wifly-City System Inc.
 90:18:AE	ShanghaiMe             # Shanghai Meridian Technologies, Co. Ltd.
 90:27:E4	Apple
 90:3D:5A	ShenzhenWi             # Shenzhen Wision Technology Holding Limited
@@ -16635,6 +16654,7 @@
 90:6D:C8	DlgAutomaç             # DLG Automação Industrial Ltda
 90:7F:61	ChiconyEle             # Chicony Electronics Co., Ltd.
 90:84:0D	Apple                  # Apple, Inc
+90:88:A2	IonicsTech             # IONICS TECHNOLOGY ME LTDA
 90:A2:DA	GheoSa                 # GHEO SA
 90:A7:C1	PakedgeDev             # Pakedge Device and Software Inc.
 90:E0:F0	IeeeP1722              # IEEE P1722 
@@ -16679,6 +16699,7 @@
 9C:CD:82	ChengUeiPr             # CHENG UEI PRECISION INDUSTRY CO.,LTD
 9C:EB:E8	BizlinkKun             # BizLink (Kunshan) Co.,Ltd
 9C:F6:1A	UtcFireAnd             # UTC Fire and Security
+9C:FF:BE	Otsl                   # OTSL Inc.
 A0:07:98	SamsungEle             # Samsung Electronics
 A0:18:59	ShenzhenYi             # Shenzhen Yidashi Electronics Co Ltd
 A0:23:1B	TelecompR&             # TeleComp R&D Corp.
@@ -16742,6 +16763,7 @@ AA:00:01	DigitalEqu             # DIGITAL EQUIPMENT CORPORATION
 AA:00:02	DigitalEqu             # DIGITAL EQUIPMENT CORPORATION
 AA:00:03	DigitalEqu             # DIGITAL EQUIPMENT CORPORATION
 AA:00:04	DigitalEqu             # DIGITAL EQUIPMENT CORPORATION
+AC:34:CB	ShanhaiGbc             # Shanhai GBCOM Communication Technology Co. Ltd
 AC:44:F2	Revolabs               # Revolabs Inc
 AC:4F:FC	Svs-Vistek             # SVS-VISTEK GmbH
 AC:51:35	MpiTech                # MPI TECH
@@ -16766,11 +16788,13 @@ B0:90:74	FulanElect             # Fulan Electronics Limited
 B0:91:34	Taleo
 B0:97:3A	E-Fuel                 # E-Fuel Corporation
 B0:AA:36	GuangdongO             # GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD.
+B0:B8:D5	NanjingNen             # Nanjing Nengrui Auto Equipment CO.,Ltd
 B0:C6:9A	JuniperNet             # Juniper Networks
 B0:C8:AD	PeoplePowe             # People Power Company
 B0:E3:9D	CatSystem              # CAT SYSTEM CO.,LTD.
 B0:E7:54	2wire
 B0:E9:7E	AdvancedMi             # Advanced Micro Peripherals
+B4:07:F9	SamsungEle             # SAMSUNG ELECTRO-MECHANICS
 B4:08:32	TcCommunic             # TC Communications
 B4:2C:BE	DirectPaym             # Direct Payment Solutions Limited
 B4:37:41	Consert                # Consert, Inc.
@@ -16823,6 +16847,7 @@ C4:17:FE	HonHaiPrec             # Hon Hai Precision Ind. Co.,Ltd.
 C4:19:8B	DominionVo             # Dominion Voting Systems Corporation
 C4:1E:CE	HmiSources             # HMI Sources Ltd.
 C4:2C:03	Apple
+C4:3D:C7	Netgear
 C4:46:19	HonHaiPrec             # Hon Hai Precision Ind. Co.,Ltd. 
 C4:59:76	Fugoo
 C4:63:54	U-Raku                 # U-Raku, Inc.
@@ -16886,11 +16911,13 @@ D4:8F:AA	SogecamInd             # Sogecam Industrial, S.A.
 D4:96:DF	SungjinC&T             # SUNGJIN C&T CO.,LTD
 D4:9A:20	Apple                  # Apple, Inc
 D4:9C:28	JaybirdGea             # JayBird Gear LLC
+D4:A9:28	GreenwaveR             # GreenWave Reality Inc
 D4:AA:FF	MicroWorld             # MICRO WORLD 
 D4:C7:66	Acentic                # Acentic GmbH
 D4:E8:B2	SamsungEle             # Samsung Electronics
 D4:F1:43	Iproad                 # IPROAD.,Inc
 D8:1B:FE	Twinlinx               # TWINLINX CORPORATION
+D8:1C:14	CompactaIn             # Compacta International, Ltd.
 D8:28:C9	GeneralEle             # General Electric Consumer and Industrial
 D8:29:86	BestWishTe             # Best Wish Technology LTD
 D8:30:62	Apple                  # Apple, Inc
@@ -16925,6 +16952,7 @@ E0:26:36	NortelNetw             # Nortel Networks
 E0:27:1A	TtcNext-Ge             # TTC Next-generation Home Network System WG
 E0:58:9E	LaerdalMed             # Laerdal Medical
 E0:5B:70	Innovid                # Innovid, Co., Ltd.
+E0:62:90	JinanJovis             # Jinan Jovision Science & Technology Co., Ltd.
 E0:64:BB	DigiviewSR             # DigiView S.r.l.
 E0:87:B1	Nata-Info              # Nata-Info Ltd.
 E0:8F:EC	Repotec                # REPOTEC CO., LTD.
@@ -16939,6 +16967,7 @@ E0:E7:51	Nintendo               # Nintendo Co., Ltd.
 E2:0C:0F	KingstonTe             # Kingston Technologies
 E4:1F:13	Ibm
 E4:35:93	HangzhouGo             # Hangzhou GoTo technology Co.Ltd
+E4:46:BD	C&CTechnic             # C&C TECHNIC TAIWAN CO., LTD.
 E4:75:1E	GetingeSte             # Getinge Sterilization AB
 E4:7C:F9	SamsungEle             # Samsung Electronics Co., LTD
 E4:83:99	MotorolaCh             # Motorola CHS