[Automatic manuf, services and enterprise-numbers update for 2012-11-25]

svn path=/trunk-1.8/; revision=46179

3 files changed, 190 insertions, 8 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index 66a8e71050..1304e5bcb6 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2012-11-18)
+(last updated 2012-11-22)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -11418,9 +11418,9 @@ Decimal
     Berry Kercheval
       berry&join.com
 2853
-  IDEXX Software Division
-    David Kincaid
-      dkincaid&advancedvet.com
+  IDEXX Laboratories, Inc.
+    George Rusak
+      winsystems&idexx.com
 2854
   Network Computing Technologies, Inc.
     Martin Cooley
@@ -80088,7 +80088,7 @@ d'Abomey-Calavi
 20133
   izac.org
     Benoit Izac
-      benoit.izac&free.fr
+      benoit&izac.org
 20134
   Surf and Sip Inc.
     Mack Nagashima
@@ -162317,7 +162317,7 @@ Decentralization / Helenic Public Administra
 40683
   Open Grid Europe GmbH 
     Norbert Holtkamp
-      norbert.holtkamp&open-grid-europe.com
+      pen-admin&open-grid-europe.com
 40684
   Appdynamics
     Boris Livshutz
@@ -163026,6 +163026,154 @@ Decentralization / Helenic Public Administra
   Protocom Technology
     Mohamad Charafeddine
       support&protocomtech.com.au
+40861
+  Silent Softwares Pvt. Ltd.
+    Patel Jigneshkumar Prakashbai
+      admin&silentcomponents.com
+40862
+  Systema Technologies SA
+    Mike Chatzipetros
+      michalis&systema.gr
+40863
+  UP-nxt
+    Maarten Bynens
+      maarten.bynens&up-nxt.com
+40864
+  Larcan Inc
+    Mr William E Meechem
+      bmeechem&larcan.com
+40865
+  Majorpower Corporation
+    Samuel Norman
+      snorman&majorpower.com
+40866
+  Arcusys Oy
+    Jouni Hiltunen
+      jouni.hiltunen&arcusys.fi
+40867
+  Boardroom Pty Limited
+    David Watson
+      pen&boardroomlimited.com.au
+40868
+  Genew Technologies Co.,Ltd
+    mingtao yang
+      yangmt&genew.com.cn
+40869
+  TAIWAN-CA Inc.
+    Robin Lin
+      robin.lin&twca.com.tw
+40870
+  Closed Joint Stock Company Interfax
+    Vladimir Timofeev
+      noc&interfax.ru
+40871
+  poweroasis
+    Pete Bishop
+      Pete.Bishop&poweroasis.com
+40872
+  Pardazeshgaran Saman Banking Solutions
+    Bijan Hoomand
+      hoomand&samanpr.com
+40873
+  Semafone Limited
+    Sam Harry
+      techsupport&semafone.com
+40874
+  LL Control Solutions International (PTY) Ltd
+    Lukas Hendriks
+      lukas&llcsi.com
+40875
+  OfficeCore
+    Dan Avni
+      danavni&officecore.com
+40876
+  Pressens Fællesindkøb
+    Martin Kjeldsen
+      mk&bluepipe.dk
+40877
+  myprocurement
+    Quentin Ambard
+      qambard&myprocurement.fr
+40878
+  Venere Net Srl
+    Giuseppe Lavagetto
+      vsysadm&expedia.com
+40879
+  VERION TEKNOLOJI A.S.
+    BULENT KAPTAN
+      bulent.kaptan&verion.com.tr
+40880
+  DBI Software, Inc.
+    Ward Fry
+      support&dbisoftware.com
+40881
+  Mutualink Inc
+    Charles Wegrzyn
+      cwegrzyn&mutualink.net
+40882
+  Step One AS
+    Nils Magnus Englund
+      nme&stepone.no
+40883
+  Beijing CangLang TV Technologies Co., Ltd.
+    Tom Yu
+      yutao&canglangtv.com
+40884
+  Instituto Federal Fluminense - IFF
+    Andre Cunha
+      acunha&iff.edu.br
+40885
+  ELCUS
+    Lukowkin Andrey
+      mail&elcus.ru
+40886
+  Kommunales Rechenzentrum Minden-Ravensberg/Lippe
+    Andreas Ollenburg
+      a.ollenburg&krz.de
+40887
+  Edeka Minden-Hannover IT-/logistic service GmbH
+    Sven Linscheid
+      idm.admin&minden.edeka.de
+40888
+  Universitaetsklinikum Tuebingen
+    Oliver Warda 
+      oliver.warda&med.uni-tuebingen.de
+40889
+  Global Invacom Ltd
+    Leigh Coombs
+      leigh.coombs&globalinvacom.com
+40890
+  Hardomo
+    Diego Mejia
+      ingenieria&hardomo.com
+40891
+  RDC, Inc. dba LynTec
+    Dan Nguyen
+      dan&lyntec.com
+40892
+  Abimus
+    Patrik Karisch
+      office&abimus.com
+40893
+  University of the Arts Helsinki
+    Juha Nyholm
+      oid-admin&uniarts.fi
+40894
+  Cory-Net
+    Craig Cory
+      craig&cory-net.com
+40895
+  VRVis Zentrum für Virtual Reality und Visualisierung Forschungs-GmbH
+    Sergej Schweizer, Adi Kriegisch
+      ssc&vrvis.at
+40896
+  Pearson Technology
+    David Ferguson
+      david.ferguson&pearson.com
+40897
+  C.S. Veritas
+    Maarten Abbink
+      coda&veritas.nl
 
 
 End of Document
diff --git a/manuf b/manuf
index 316dcab21d..1c25c7e0d9 100644
--- a/manuf
+++ b/manuf
@@ -18090,6 +18090,28 @@
 40:D8:55:03:50:00/36	Mesotech               # Mesotech International, Inc.
 40:D8:55:03:60:00/36	Schweers               # Schweers informationstechnologie GmbH
 40:D8:55:03:70:00/36	Software               # Software Workshop
+40:D8:55:03:80:00/36	SpecialM               # Special Measurements Labs LLC
+40:D8:55:03:90:00/36	Ci                     # CI Systems Ltd
+40:D8:55:03:A0:00/36	SocusNet               # Socus networks
+40:D8:55:03:B0:00/36	Telcomko               # Telcomkorea
+40:D8:55:03:C0:00/36	Computer               # Computer System Co.,Ltd
+40:D8:55:03:D0:00/36	TekelekE               # Tekelek Europe Ltd
+40:D8:55:03:E0:00/36	VishayCe               # Vishay Celtron Technologies, Inc.
+40:D8:55:03:F0:00/36	UnisvrGl               # UniSVR Global Information Technology Corp.
+40:D8:55:04:00:00/36	GhlBerha               # GHL Systems Berhad
+40:D8:55:04:10:00/36	TQMItaca               # T.Q.M. Itaca Technology s.r.l.
+40:D8:55:04:20:00/36	MangoCom               # Mango Communicaitons Inc.
+40:D8:55:04:30:00/36	Schulerc               # SchulerControl GmbH
+40:D8:55:04:40:00/36	AnChenCo               # An Chen Computer Co. Ltd.
+40:D8:55:04:50:00/36	Genadsys               # Genadsystem
+40:D8:55:04:60:00/36	Circuitl               # Circuitlink Pty Ltd
+40:D8:55:04:70:00/36	Dos&Dont               # Dos&Donts SRL
+40:D8:55:04:80:00/36	GeneralD               # GENERAL DYNAMICS C4 SYSTEMS
+40:D8:55:04:90:00/36	ThermoFi               # Thermo Fisher Scientific
+40:D8:55:04:A0:00/36	GatewayT               # Gateway Technologies SA de CV
+40:D8:55:04:B0:00/36	VitalTec               # Vital Tech Industria e Comercio Ltda
+40:D8:55:04:C0:00/36	Serveron               # Serveron Corporation
+40:D8:55:04:D0:00/36	Machinep               # MACHINEPERFORMANCE ApS
 40:E7:93	Shenzhen               # Shenzhen Siviton Technology Co.,Ltd
 40:EC:F8	Siemens                # Siemens AG
 40:EF:4C	Fihonest               # Fihonest communication co.,Ltd
diff --git a/services b/services
index 68c6ac13bf..42738bf18f 100644
--- a/services
+++ b/services
@@ -14,7 +14,7 @@
 # Service Name and Transport Protocol Port Number Registry
 # 
 # Last Updated
-# 2012-11-14
+# 2012-11-20
 # 
 # Experts
 # 
@@ -14278,7 +14278,10 @@ nmc-disc	10810/udp	# Nuance Mobile Care Discovery [Gordon_Waddell]
 # 10811-10859           Unassigned
 helix	10860/tcp	# Helix Client/Server          [Matthew_Strange][Larry_Atkin_2]                   [Matthew_Strange][Larry_Atkin_2]                          2009-03-06
 helix	10860/udp	# Helix Client/Server          [Matthew_Strange][Larry_Atkin_2]                   [Matthew_Strange][Larry_Atkin_2]                          2009-03-06
-# 10861-10989           Unassigned
+# 10861-10879           Unassigned
+bveapi	10880/tcp	# BVEssentials HTTP API        [Tri_Tech_Computers_Ltd]                           [James_Emerton]                                           2012-11-19
+bveapi	10880/udp	# BVEssentials HTTP API        [Tri_Tech_Computers_Ltd]                           [James_Emerton]                                           2012-11-19
+# 10881-10989           Unassigned
 rmiaux	10990/tcp	# Auxiliary RMI Port           [Eugen_Bacic_2]                                    [Eugen_Bacic_2]
 rmiaux	10990/udp	# Auxiliary RMI Port           [Eugen_Bacic_2]                                    [Eugen_Bacic_2]
 # 10991-10999           Unassigned
@@ -15976,6 +15979,7 @@ matahari	49000/tcp	# Matahari Broker              [Matahari_Project]
 # boxraysrvr                     tcp    Boxray Devices Host Server   [Caprice_Productions]                              [Lance_Drake]                                             2012-07-05                                                                               Defined TXT keys: none
 # bri                                   RFID Reader Basic Reader     [Thaddeus_Ternes]                                  [Thaddeus_Ternes]                                                                                                                                  Defined TXT keys: None
 # Interface
+# bridgeprotocol                 tcp    JSON RPC Bridge Protocol     [Michel_Stam_2]                                    [Michel_Stam_2]                                           2012-11-20                                                                               Defined TXT keys: path, version
 # bsqdea                                Backup Simplicity            [Qdea]                                             [Qdea]                                                                                                                                             Defined TXT keys: None
 # caldav                         tcp    Calendaring Extensions to    [IESG]                                             [IETF_Chair]                                              2012-02-17                [draft-daboo-srv-caldav]                                       This is an extension of the http service. Defined TXT keys:
 # WebDAV (CalDAV) - non-TLS                                                                                                                                                                                                          path=<context path>
@@ -16524,6 +16528,7 @@ matahari	49000/tcp	# Matahari Broker              [Matahari_Project]
 # Server
 # p2pchat                        udp    Peer-to-Peer Chat (Sample    [Roger_Pantos]                                     [Roger_Pantos]                                                                                                                                     Defined TXT keys: None
 # Java Bonjour application)
+# p2pstorage-sec                 tcp    DataBOND p2p storage         [Dell]                                             [Jessica_Zhang]                                           2012-11-19                                                                               Defined TXT keys: txtvers, machineid, status
 # pairandshare                   tcp    Pair & Share data protocol   [Intel]                                            [Joshua_Boelter]                                          2011-10-18                                                                               Defined TXT keys: Proprietary
 # panoply                        tcp    Panoply multimedia composite [Natarajan_Balasundar]                             [Natarajan_Balasundar]                                                                                                                             Defined TXT keys: None
 # transfer protocol
@@ -18127,6 +18132,7 @@ matahari	49000/tcp	# Matahari Broker              [Matahari_Project]
 # [Dean_Webb]                                               Dean Webb                                       mailto:dean.webb&ascend.com
 # [DEIF_AS]                                                                           DEIF A/S              mailto:aes&deif.com                                           2012-10-15
 # [Delcio_Prizon]                                           Delcio Prizon                                   mailto:dprizon&smar.com.br
+# [Dell]                                                                              Dell                  mailto:jessica_z&dell.com                                     2012-11-19
 # [Delphix_Corp]                                                                      Delphix Corp          mailto:peng.dai&delphix.com                                   2012-11-01
 # [Denis_Ducharme]                                          Denis Ducharme                                  mailto:dducharme&softek.com
 # [Denis_Leclerc]                                           Denis Leclerc                                   mailto:DLeclerc&banyan.com
@@ -18876,6 +18882,8 @@ matahari	49000/tcp	# Matahari Broker              [Matahari_Project]
 # [James_David_Fisher]                                      James David Fisher                              mailto:jfisher1&avaya.com
 # [James_E_Housley]                                         James E. Housley                                mailto:jim&thehousleys.net
 # [James_E_King_III]                                        James E. King, III                              mailto:James_E_K&dell.com                                     2010-06-24
+# [James_Emerton]                                           James Emerton             Tri Tech Computers    mailto:james&tri-tech.com                                     2012-11-19
+# Ltd.
 # [James_Falkner]                                           James Falkner                                   mailto:james.falkner&sun.com
 # [James_Figgins]                                           James Figgins                                   mailto:james.figgins&durodata.co.uk                           2006-07
 # [James_Gettys]                                            James Gettys                                    mailto:jg&w3.org
@@ -19045,6 +19053,7 @@ matahari	49000/tcp	# Matahari Broker              [Matahari_Project]
 # [Jesse_Ursery]                                            Jesse Ursery                                    mailto:jesse.ursery&ametek.com                                2010-11-22
 # [Jesse_W_Towner]                                          Jesse W. Towner                                 mailto:jwtowner&dsmedialabs.com
 # [Jessica_Yan]                                             Jessica Yan                                     mailto:jessica.yan2&t-mobile.com                              2008-02-19
+# [Jessica_Zhang]                                           Jessica Zhang             Dell                  mailto:jessica_z&dell.com                                     2012-11-19
 # [Jesus_David_Rodrigue]                                    Jesus David Rodriguez                           mailto:jesusdavid&magaya.com                                  2003-02
 # [Jesus_De_Meyer]                                          Jesus De Meyer                                  mailto:jesus&edot-studios.com
 # [Jesus_Ortiz]                                             Jesus Ortiz                                     mailto:jesus_ortiz&emotion.com
@@ -19988,6 +19997,7 @@ matahari	49000/tcp	# Matahari Broker              [Matahari_Project]
 # [Michel_Bourget]                                          Michel Bourget                                  mailto:michel&sgi.com                                         2009-01-06
 # [Michel_Stam]                                             Michel Stam               HaloteC Instruments   mailto:michel.stam&halotec.com                                2012-02-07
 # B.V.
+# [Michel_Stam_2]                                           Michel Stam                                     mailto:michel.iana&reverze.net                                2012-11-20
 # [Micromat]                                                Micromat                                        mailto:support&micromat.com
 # [Microsoft_Corporation]                                                             Microsoft Corporation mailto:pratshar&microsoft.com                                 2011-08-04
 # [Microsoft_Corporation_2]                                                           Microsoft Corporation mailto:stdsreq&microsoft.com                                  2012-03-15
@@ -21492,6 +21502,8 @@ matahari	49000/tcp	# Matahari Broker              [Matahari_Project]
 # Development Team
 # [Trevor_Bell]                                             Trevor Bell                                     mailto:Trevor&iguana.iosoftware.com
 # [Trevor_Perkes]                                           Trevor Perkes                                   mailto:trevor.perkes&landesk.com                              2010-02-01
+# [Tri_Tech_Computers_Ltd]                                                            Tri Tech Computers    mailto:admins&tri-tech.com                                    2012-11-19
+# Ltd.
 # [Tristan_Richardson]                                      Tristan Richardson                              mailto:iana&realvnc.com                                       2006-03
 # [Tristan_Seifert]                                         Tristan Seifert                                 mailto:admin&247server.net                                    2011-01-31
 # [Tristan_Seifert_2]                                       Tristan Seifert           Squee! Application    mailto:tristan&squee.co                                       2011-07-19