[Automatic manuf, services and enterprise-numbers update for 2014-06-22]

Change-Id: Idb1ac02fe97a2d6b3603467d482a9a9040843704
Reviewed-on: https://code.wireshark.org/review/2543
Reviewed-by: Gerald Combs <gerald@wireshark.org>

2 files changed, 187 insertions, 12 deletions

diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index c83cf138ef..0931118e2f 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2014-06-13)
+(last updated 2014-06-20)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -25902,9 +25902,9 @@ Decimal
     Douglas Sellers
       doug.sellers&cmgisolutions.com
 6486
-  Alcatel
-    David R. Dalton
-      David.Dalton&IND.Alcatel.COM
+  Alcatel-Lucent (previous was 'Alcatel')
+    Ravi Govil
+      ravi.govil&alcatel-lucent.com
 6487
   YouSync
     Albert Allen
@@ -35510,9 +35510,9 @@ Decimal
     Ludovic Smadja
       lsmadja&webgsm.com
 8889
-  The Virtual Solution Software GmbH
-    Bernhard V. Fromberg
-      b.fromberg&virtual-solution.de
+  virtual solution AG
+    Dr. Raoul-Thomas Herborg 
+      raoul.herborg&virtual-solution.com
 8890
   Broadcast Technology Limited
     Tony Carr
@@ -136804,9 +136804,9 @@ Decentralization / Helenic Public Administra
     John Minnis
       iana&developingsolutions.com
 34306
-  Decre
+  Canodus (previous was 'Decre')
     Wout Decré
-      wout&delta-design.be
+      wout&canodus.be
 34307
   Deckland
     Martin Ried
@@ -175152,6 +175152,146 @@ Decentralization / Helenic Public Administra
   NerySEC
     Kyra Zimmer
       me&nonchip.de
+43893
+  Hope Bay Technologies, Inc.
+    Pa Hsuan
+      pa.hsuan&hopebaytech.com
+43894
+  HedoN electronic developments B.V.
+    Remon Dijkstra
+      rdijkstra&hedon.nl
+43895
+  Institut für Holztechnologie Dresden gemeinnützige GmbH
+    Thomas Hupfer
+      hupfer&ihd-dresden.de
+43896
+  Emercit
+    Sergey Tsidilov
+      tsidilov&emercit.ru
+43897
+  Amped Wireless
+    Anthony Ng
+      anthony&ampedwireless.com
+43898
+  Hudson City Savings Bank
+    Thomas Slattery
+      tslattery&hcsbnj.com
+43899
+  atlantis software
+    alexandre tiertant
+      a.tiertant&atlantis-software.net
+43900
+  Teramatrix Technologies Private Limited
+    Amit Sharma
+      asharma&teramatrix.in
+43901
+  Talisman Sinopec Energy UK Limited
+    Andrew Bentley
+      hostmaster&talisman-sinopec.com
+43902
+  Enkel Tecnologia
+    Oscar Flores
+      oscar.flores&enkeltecnologia.com
+43903
+  LIons Clubs International - Multi District 111 (Germany)
+    Stefan Kaufmann
+      portal&lions.de
+43904
+  BitronikLab 
+    Milovan Čolić
+      bitroniklab&gmail.com
+43905
+  MelRok LLC
+    GY Hanna
+      gyhanna&melrok.com
+43906
+  Tegile Systems, Inc.
+    Pradipmaya Maharana
+      pradip&tegile.com
+43907
+  CloudThing Ltd.
+    Francis Thomas
+      fran&cloudthing.com
+43908
+  Hawking Technology, Inc.
+    Frank Lin
+      Frank&hawkingtech.com
+43909
+  Association PauLLA
+    Simon RECHER
+      president&paulla.asso.fr
+43910
+  Pravala Inc.
+    Jakub Schmidtke
+      admin&pravala.com
+43911
+  Thureon Limited
+    Ross Vincent
+      ross.vincent&thureon.com
+43912
+  FUJI FURUKAWA ENGINEERING & CONSTRUCTION Co.Ltd. 
+    Satoshi Nagai
+      nagai-satoshi&ffec.co.jp
+43913
+  Zhejiang Science Electronic Technology Co., Ltd
+    Changyu Liu
+      cliu&zjsaisi.com
+43914
+  The Administrative Committee of Jiangning Development Zone
+    Buqiang Liu
+      lbq&jndz.net
+43915
+  Wallace Kroeker
+    Wallace Kroeker
+      wallacekroeker&rundletech.com
+43916
+  Van Lanschot
+    Niels de Kok
+      wintel&vanlanschot.com
+43917
+  SantéLink SAS
+    Romain Tartière
+      pen&santelink.fr
+43918
+  Marina Del Rey Hospital
+    Robbin Messier
+      robbin.messier&marinahospital.com
+43919
+  Neoteck Grup
+    Mihai Cretu
+      office&neoteck.ro
+43920
+  Shandong Chaoyue Digital Control Electronics Co., Ltd.
+    Qingshi Li
+      liqsh&inspur.com
+43921
+  CJSC STC SIMOS
+    Tarasov Nikolai
+      tarasov&simos.ru
+43922
+  Equra Health Trust
+    Piet Theron
+      ptheron&equrahealth.co.za
+43923
+  Ivan Leonardi
+    Ivan Leonardi
+      ivanleonardi&gmail.com
+43924
+  Standard Transfer Specification Association
+    Franco Pucci
+      franco.p&mweb.co.za
+43925
+  EastWind
+    Andrew Pavlenko
+      a.pavlenko&eastwind.ru
+43926
+  CSI.NET, Inc.
+    Daniel J. McGrail
+      dmcgrail&csiworld.com
+43927
+  ID.me, Inc.
+    Tom Robison
+      tom&id.me
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index 7b7178f772..d98411359f 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -6506,7 +6506,7 @@ const value_string sminmpec_values[] = {
     {  6483, "Captus Networks" },
     {  6484, "Campus Crusade for Christ, Inc." },
     {  6485, "Spatial Technologies" },
-    {  6486, "Alcatel" },
+    {  6486, "Alcatel-Lucent (previous was 'Alcatel')" },
     {  6487, "YouSync" },
     {  6488, "TalentStorm Enterprises" },
     {  6489, "Siemens Cerberus" },
@@ -8909,7 +8909,7 @@ const value_string sminmpec_values[] = {
     {  8886, "Beijing Raisecom Scientific & Technology Development Co., Ltd." },
     {  8887, "VASoft (Pty) Ltd." },
     {  8888, "WEBGSM" },
-    {  8889, "The Virtual Solution Software GmbH" },
+    {  8889, "virtual solution AG" },
     {  8890, "Broadcast Technology Limited" },
     {  8891, "sforce.org" },
     {  8892, "Chaman Productions" },
@@ -34326,7 +34326,7 @@ const value_string sminmpec_values[] = {
     { 34303, "Skyline Network Engineering" },
     { 34304, "Feynman Group, Inc." },
     { 34305, "Developing Solutions, Inc." },
-    { 34306, "Decre" },
+    { 34306, "Canodus (previous was 'Decre')" },
     { 34307, "Deckland" },
     { 34308, "Ford & Mason Ltd" },
     { 34309, "Archimedes Solutions GmbH" },
@@ -43913,6 +43913,41 @@ const value_string sminmpec_values[] = {
     { 43890, "Thotaka Technologies Private Limited" },
     { 43891, "SMY.com" },
     { 43892, "NerySEC" },
+    { 43893, "Hope Bay Technologies, Inc." },
+    { 43894, "HedoN electronic developments B.V." },
+    { 43895, "Institut f\0303\0274r Holztechnologie Dresden gemeinn\0303\0274tzige GmbH" },
+    { 43896, "Emercit" },
+    { 43897, "Amped Wireless" },
+    { 43898, "Hudson City Savings Bank" },
+    { 43899, "atlantis software" },
+    { 43900, "Teramatrix Technologies Private Limited" },
+    { 43901, "Talisman Sinopec Energy UK Limited" },
+    { 43902, "Enkel Tecnologia" },
+    { 43903, "LIons Clubs International - Multi District 111 (Germany)" },
+    { 43904, "BitronikLab " },
+    { 43905, "MelRok LLC" },
+    { 43906, "Tegile Systems, Inc." },
+    { 43907, "CloudThing Ltd." },
+    { 43908, "Hawking Technology, Inc." },
+    { 43909, "Association PauLLA" },
+    { 43910, "Pravala Inc." },
+    { 43911, "Thureon Limited" },
+    { 43912, "FUJI FURUKAWA ENGINEERING & CONSTRUCTION Co.Ltd. " },
+    { 43913, "Zhejiang Science Electronic Technology Co., Ltd" },
+    { 43914, "The Administrative Committee of Jiangning Development Zone" },
+    { 43915, "Wallace Kroeker" },
+    { 43916, "Van Lanschot" },
+    { 43917, "Sant\0303\0251Link SAS" },
+    { 43918, "Marina Del Rey Hospital" },
+    { 43919, "Neoteck Grup" },
+    { 43920, "Shandong Chaoyue Digital Control Electronics Co., Ltd." },
+    { 43921, "CJSC STC SIMOS" },
+    { 43922, "Equra Health Trust" },
+    { 43923, "Ivan Leonardi" },
+    { 43924, "Standard Transfer Specification Association" },
+    { 43925, "EastWind" },
+    { 43926, "CSI.NET, Inc." },
+    { 43927, "ID.me, Inc." },
     {    0, NULL}
 };