[Automatic manuf, services and enterprise-numbers update for 2014-08-31]

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

3 files changed, 202 insertions, 12 deletions

diff --git a/epan/dissectors/usb.c b/epan/dissectors/usb.c
index aecc0dda31..3d97e7fd84 100644
--- a/epan/dissectors/usb.c
+++ b/epan/dissectors/usb.c
@@ -12293,7 +12293,7 @@ static const value_string usb_products_vals[] = {
     { 0x0930653e, "Flash Memory" },
     { 0x09306540, "TransMemory Flash Memory" },
     { 0x09306544, "Kingston DataTraveler 2.0 Stick (2GB)" },
-    { 0x09306545, "Kingston DataTraveler 102 Flash Drive / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick" },
+    { 0x09306545, "Kingston DataTraveler 102/2.0 / HEMA Flash Drive 2 GB / PNY Attache 4GB Stick" },
     { 0x09307100, "Toshiba Thrive AT100/AT105" },
     { 0x09320300, "VideoAdvantage" },
     { 0x09320302, "Syntek DC-112X" },
diff --git a/epan/enterprise-numbers b/epan/enterprise-numbers
index a98814d0ab..c905d01736 100644
--- a/epan/enterprise-numbers
+++ b/epan/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2014-08-23)
+(last updated 2014-08-31)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -77109,8 +77109,8 @@ da Faculdade de Ciências e Tecnologia da Universidade Nova de Lisboa
       stephan.kurth&tlc.de
 19389
   ComSign Ltd.
-    Erez Shapira
-      ErezS&ComSign.co.il
+    Zeev Shetach
+      Zeev&ComSign.co.il
 19390
   Trend Software LLC
     VASILIY GAGIN
@@ -126112,9 +126112,9 @@ Decentralization / Helenic Public Administra
     Zu-xiong Qiu
       qiu1111&sh-titan.com
 31633
-  EBM Telecom AG
+  Quickline Business AG (previous was 'EBM Telecom AG')
     Benjamin Schlageter
-      b.schlageter&ebm.ch
+      benjamin.schlageter&business.quickline.ch
 31634
   ICT Embedded b.v.
     Jorg Wissink
@@ -154390,8 +154390,8 @@ Decentralization / Helenic Public Administra
       ADMIN&ECBIZNET.ORG
 38702
   Talisman Energy Inc
-    Andrew Bentley
-      abentley&talisman-energy.com
+    Jeff Pitman
+      jpitman&talisman-energy.com
 38703
   Advancia Corporation
     Rod Miller
@@ -176399,7 +176399,7 @@ Decentralization / Helenic Public Administra
 44204
   Medical Oncology Associates of Long Island, PC
     Sandra Rosenberg/Ronnie Morales
-      sirliny&aol.com
+      srosenberg&medoncli.com
 44205
   BandRich, Inc.
     Purine Chu
@@ -176441,7 +176441,7 @@ Decentralization / Helenic Public Administra
     Jamison Budacki
       jamison.budacki&erieinsurance.com
 44215
-  Arsslen Idadi
+  Arsslensoft
     Arsslen Idadi
       arsslens021&gmail.com
 44216
@@ -176692,6 +176692,158 @@ Decentralization / Helenic Public Administra
   Mike Tennant
     Mike Tennant
       mtennant&bigted.net
+44278
+  ShangHai RealCom Communication Technology Co.,Ltd.
+    Li Yan
+      tech&realcom.com.cn
+44279
+  ZheJiang University PRESS
+    Tong HuaZhang
+      tonghz&zju.edu.cn
+44280
+  F E T Elettronica snc
+    Marco Tani
+      info&fet.it
+44281
+  Blood & Marrow Transplant Group of Georgia
+    Robin Cullen
+      rcullen&bmtga.com
+44282
+  Microware Computing & Consulting Pvt Ltd
+    Sanjay Sangal
+      sanjay&sanjaysangal.com
+44283
+  Appnovation Technologies Inc
+    Will Sheldon
+      will&appnovation.com
+44284
+  Time4 Systems Ltd.
+    Kenneth Hann
+      ken&time4systems.com
+44285
+  New England Cancer Specialists
+    James Reddy
+      reddyj&newecs.org
+44286
+  Working Distributors, Inc.
+    Ken Mautz
+      it&workingdistributors.com
+44287
+  JConcept Open Solutions
+    OLIVIER SMADJA
+      olivier&jconcept.com.br
+44288
+  greaty
+    xiaoyong.huang
+      xiaoyong.huang&greatytech.com
+44289
+  Beijing Cyber Greatwall Information Technology Co., Ltd.
+    Liu Junfeng
+      info&cybergreatwall.com
+44290
+  Sajeev Anand, M.D., LLC
+    Robin Williams
+      rrwilliams726&gmail.com
+44291
+  New London Cancer Center
+    Mithlesh Govil
+      mgovil&gmail.com
+44292
+  emplus Networks Inc.
+    Stan H.Y, Liu
+      stan.liu&senao.com
+44293
+  Unwired Networks GmbH
+    Gregor Glashuettner
+      gregor.glashuettner&unwired.at
+44294
+  Quanta-Computing
+    Matthieu ROSINSKI
+      sysadmin&quanta-computing.com
+44295
+  SSE - Stuellein Software Engineering
+    Christian Stuellein
+      christian.stuellein&sse-engineering.de
+44296
+  HelmetHub
+    James Griffith
+      jgriffith&helmet-hub.com
+44297
+  Alliance Cancer Specialists, PC
+    Susan Lindner
+      bhoma130&gmail.com
+44298
+  CogVis GmbH
+    Jürgen Konetschnig
+      konetschnig&cogvis.at
+44299
+  I.M. Dauntless
+    Ramona Trevino
+      ramonatrevino&sbcglobal.net
+44300
+  Cyber1st R&D Ltd.
+    Jonathan Spurgin
+      jonathan.spurgin&cyber1st.co.uk
+44301
+  Alexander Maier GmbH
+    Alexander Maier
+      alexander.maier&maier-gst.de
+44302
+  Clearview Cancer Institute
+    Michelle Brown, Chief Operations Officer
+      mbrown&ccihsv.com
+44303
+  Netz-AG Emil-Figgestraße 15-39
+    Fabian Reiners
+      fabian.reiners&wh-nef.de
+44304
+  HEMATOLOGY ONCOLOGY LIFE CENTER LLC
+    JULIE BEENE
+      JBEENE&HOLCMED.COM
+44305
+  Oncology Hematology Associates of Springfield, MD, PC
+    Amber Pierce
+      amberpierce22&gmail.com
+44306
+  CAROLINA ONCOLOGY ASSOCIATES, P.A.
+    EMILY SHEPHERD
+      ESHEPHERD&CAROLINAONCOLOGY.COM
+44307
+  LP Technologies, Inc.
+    Micky Mukalay
+      info&lptech.com
+44308
+  Centripetal Networks, Inc.
+    Justin Rogers
+      admin&centripetalnetworks.com
+44309
+  Center for Cancer Care
+    Candace Hayes
+      chayes&suburban-hemonc.com
+44310
+  SiteSpect, Inc.
+    Simon Tetelbaum
+      stetelbaum&sitespect.com
+44311
+  Budapesti Fazekas Mihaly Gyakorlo Altalanos Iskola es Gimnazium
+    Herczeg Zsolt
+      herczeg.zsolt&fazekas.hu
+44312
+  Amundson Partners, Inc.
+    Mark Amundson PharmD
+      mpa&cableone.net
+44313
+  Johan Grip (ogun.org)
+    Johan Grip
+      ogun&ogun.org
+44314
+  Democritus University of Thrace
+    Ioannis Alexiadis
+      noc&duth.gr
+44315
+  Guido Di Fazio
+    Guido Di Fazio
+      g.difazio&mclink.it
 
 
 End of Document
diff --git a/epan/sminmpec.c b/epan/sminmpec.c
index ef8ca16017..395f26a866 100644
--- a/epan/sminmpec.c
+++ b/epan/sminmpec.c
@@ -31653,7 +31653,7 @@ const value_string sminmpec_values[] = {
     { 31630, "media concept GmbH" },
     { 31631, "Conseil R\0303\0251gional Nord - Pas de Calais" },
     { 31632, "Shanghai Titan Technology Co., Ltd." },
-    { 31633, "EBM Telecom AG" },
+    { 31633, "Quickline Business AG (previous was 'EBM Telecom AG')" },
     { 31634, "ICT Embedded b.v." },
     { 31635, "TextFunnel" },
     { 31636, "Shanghai Colorful Magnetic Resonance Technology Co. Ltd." },
@@ -44235,7 +44235,7 @@ const value_string sminmpec_values[] = {
     { 44212, "Oncology Hematology Care of Connecticut, LLC" },
     { 44213, "Happy Gears Inc" },
     { 44214, "Erie Indemnity Company" },
-    { 44215, "Arsslen Idadi" },
+    { 44215, "Arsslensoft" },
     { 44216, "FUYOH VIDEO INDUSTRY CO.,LTD." },
     { 44217, "FiberRoad" },
     { 44218, "Buffalo Boots GmbH" },
@@ -44298,6 +44298,44 @@ const value_string sminmpec_values[] = {
     { 44275, "Illumio, Inc." },
     { 44276, "TANABIKI Inc." },
     { 44277, "Mike Tennant" },
+    { 44278, "ShangHai RealCom Communication Technology Co.,Ltd." },
+    { 44279, "ZheJiang University PRESS" },
+    { 44280, "F E T Elettronica snc" },
+    { 44281, "Blood & Marrow Transplant Group of Georgia" },
+    { 44282, "Microware Computing & Consulting Pvt Ltd" },
+    { 44283, "Appnovation Technologies Inc" },
+    { 44284, "Time4 Systems Ltd." },
+    { 44285, "New England Cancer Specialists" },
+    { 44286, "Working Distributors, Inc." },
+    { 44287, "JConcept Open Solutions" },
+    { 44288, "greaty" },
+    { 44289, "Beijing Cyber Greatwall Information Technology Co., Ltd." },
+    { 44290, "Sajeev Anand, M.D., LLC" },
+    { 44291, "New London Cancer Center" },
+    { 44292, "emplus Networks Inc." },
+    { 44293, "Unwired Networks GmbH" },
+    { 44294, "Quanta-Computing" },
+    { 44295, "SSE - Stuellein Software Engineering" },
+    { 44296, "HelmetHub" },
+    { 44297, "Alliance Cancer Specialists, PC" },
+    { 44298, "CogVis GmbH" },
+    { 44299, "I.M. Dauntless" },
+    { 44300, "Cyber1st R&D Ltd." },
+    { 44301, "Alexander Maier GmbH" },
+    { 44302, "Clearview Cancer Institute" },
+    { 44303, "Netz-AG Emil-Figgestra\0303\0237e 15-39" },
+    { 44304, "HEMATOLOGY ONCOLOGY LIFE CENTER LLC" },
+    { 44305, "Oncology Hematology Associates of Springfield, MD, PC" },
+    { 44306, "CAROLINA ONCOLOGY ASSOCIATES, P.A." },
+    { 44307, "LP Technologies, Inc." },
+    { 44308, "Centripetal Networks, Inc." },
+    { 44309, "Center for Cancer Care" },
+    { 44310, "SiteSpect, Inc." },
+    { 44311, "Budapesti Fazekas Mihaly Gyakorlo Altalanos Iskola es Gimnazium" },
+    { 44312, "Amundson Partners, Inc." },
+    { 44313, "Johan Grip (ogun.org)" },
+    { 44314, "Democritus University of Thrace" },
+    { 44315, "Guido Di Fazio" },
     {    0, NULL}
 };