From c0aac830c38a38ca0e7d5bfc20875ec49f6618bd Mon Sep 17 00:00:00 2001
From: Yufa Fang <fangyufa1@huawei.com>
Date: Fri, 15 May 2020 10:48:12 +0800
Subject: [PATCH] python-netaddr: elimate key words in python-netaddr

reason:elimate key words in python-netaddr:
	REPUBLIC OF CHINA, ROC, R.O.C., etc

Change-Id: I344be747961bcd73ea24ada1e3919b346c1bacf9
Signed-off-by: Yufa Fang <fangyufa1@huawei.com>
---
 netaddr/eui/iab.txt |   4 +-
 netaddr/eui/oui.txt | 312 ++++++++++++++++++++++----------------------
 2 files changed, 158 insertions(+), 158 deletions(-)

diff --git a/netaddr/eui/iab.txt b/netaddr/eui/iab.txt
index 02e7a9b..7756641 100644
--- a/netaddr/eui/iab.txt
+++ b/netaddr/eui/iab.txt
@@ -6170,7 +6170,7 @@ EE6000-EE6FFF                 (base 16)                     Narinet, Inc.
 40-D8-55                      (hex)                         AeroVision Avionics, Inc                     
 132000-132FFF                 (base 16)                     AeroVision Avionics, Inc                     
                                                             2F, No.30, R&D Rd. II,                       
-                                                            Hsinchu  Taiwan, R.O.C  30076                
+                                                            Hsinchu  Taiwan, 30076                
                                                             US                                           
 
 40-D8-55                      (hex)                         So-Cool Corporation.                         
@@ -14272,7 +14272,7 @@ A01000-A01FFF                 (base 16)                     Patronics Internatio
 
 00-50-C2                      (hex)                         McQuay China                                 
 740000-740FFF                 (base 16)                     McQuay China                                 
-                                                            Pinghu Village,Pinghu Town,Shenzhen,Guangdong Province,Peoples Republic of China
+                                                            Pinghu Village,Pinghu Town,Shenzhen,Guangdong Province,Peoples's Republic of China
                                                             Shenzhen  Guangdong  518111                  
                                                             CN                                           
 
diff --git a/netaddr/eui/oui.txt b/netaddr/eui/oui.txt
index 60f1f01..45d84a1 100644
--- a/netaddr/eui/oui.txt
+++ b/netaddr/eui/oui.txt
@@ -5939,7 +5939,7 @@ E05163     (base 16)		Arcadyan Corporation
 B8-16-DB   (hex)		CHANT SINCERE CO.,LTD
 B816DB     (base 16)		CHANT SINCERE CO.,LTD
 				7F-2,NO.188,SEC.3,TA TUNG ROAD
-				XIZHI DISTRICT, NEW TAIPEI CITY  TAIWAN,ROC  22103
+				XIZHI DISTRICT, NEW TAIPEI CITY  TAIWAN  22103
 				TW
 
 40-B4-CD   (hex)		Amazon Technologies Inc.
@@ -6167,7 +6167,7 @@ D825B0     (base 16)		Rockeetech Systems Co.,Ltd.
 CC-B8-A8   (hex)		AMPAK Technology, Inc.
 CCB8A8     (base 16)		AMPAK Technology, Inc.
 				No.1,Jen Ai Road Hsinchu Industrial Park, Hukou
-				Hsinchu  Taiwan ROC.  30352 
+				Hsinchu  Taiwan   30352 
 				TW
 
 10-77-B0   (hex)		Fiberhome Telecommunication Technologies Co.,LTD
@@ -7412,7 +7412,7 @@ AC6175     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 00-01-38   (hex)		XAVi Technologies Corp.
 000138     (base 16)		XAVi Technologies Corp.
 				9F, No. 129, Hsing Te Rd,
-				241 TAIWAN  241 TAIWAN  R.O.C.
+				241 TAIWAN  241 TAIWAN
 				TW
 
 00-16-6D   (hex)		Yulong Computer Telecommunication Scientific (Shenzhen) Co.,Ltd
@@ -8138,7 +8138,7 @@ B8BBAF     (base 16)		Samsung Electronics Co.,Ltd
 44-2C-05   (hex)		AMPAK Technology, Inc.
 442C05     (base 16)		AMPAK Technology, Inc.
 				No.1,Jen Ai Road Hsinchu Industrial Park, Hukou
-				Hsinchu  Taiwan ROC.  30352 
+				Hsinchu  Taiwan  30352 
 				TW
 
 8C-89-7A   (hex)		AUGTEK
@@ -8450,7 +8450,7 @@ E4A8B6     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 74-6F-F7   (hex)		Wistron Neweb Corporation
 746FF7     (base 16)		Wistron Neweb Corporation
 				No.20,Park Avenue II,Hsinchu Science Park
-				Hsin-Chu  R.O.C.  308
+				Hsin-Chu  Taiwan  308
 				TW
 
 B8-AE-ED   (hex)		Elitegroup Computer Systems Co.,Ltd.
@@ -12394,7 +12394,7 @@ D0431E     (base 16)		Dell Inc.
 
 40-8D-5C   (hex)		GIGA-BYTE TECHNOLOGY CO.,LTD.
 408D5C     (base 16)		GIGA-BYTE TECHNOLOGY CO.,LTD.
-				Pin-Jen City, Taoyuan, Taiwan, R.O.C.
+				Pin-Jen City, Taoyuan, Taiwan
 				Pin-Jen  Taoyuan  324
 				TW
 
@@ -13120,7 +13120,7 @@ ECD9D1     (base 16)		Shenzhen TG-NET Botone Technology Co.,Ltd.
 
 20-ED-74   (hex)		Ability enterprise co.,Ltd.
 20ED74     (base 16)		Ability enterprise co.,Ltd.
-				4F., No.8, Ln.7, Wuquan Rd, Wugu Dist, New Taipei City 24886, Taiwan(R.O.C)
+				4F., No.8, Ln.7, Wuquan Rd, Wugu Dist, New Taipei City 24886, Taiwan
 				Taipei  Taipei  24886
 				TW
 
@@ -13253,7 +13253,7 @@ A012DB     (base 16)		TABUCHI ELECTRIC CO.,LTD
 DC-66-3A   (hex)		Apacer Technology Inc.
 DC663A     (base 16)		Apacer Technology Inc.
 				1F., No.32, Zhongcheng Rd., Tucheng Dist.,
-				New Taipei City  Taiwan R.O.C.  236
+				New Taipei City  Taiwan.  236
 				TW
 
 08-DF-1F   (hex)		Bose Corporation
@@ -13376,7 +13376,7 @@ C09D26     (base 16)		Topicon HK Lmd.
 44-29-38   (hex)		NietZsche enterprise Co.Ltd.
 442938     (base 16)		NietZsche enterprise Co.Ltd.
 				4F. No.560 Sec2 Chung Shan Rd.
-				New Taipei City Taiwan R.O.C  Taipei ( 臺 北 縣 / 市 )  220
+				New Taipei City Taiwan Taipei ( 臺 北 縣 / 市 )  220
 				TW
 
 A0-DA-92   (hex)		Nanjing Glarun Atten Technology Co. Ltd.
@@ -14035,7 +14035,7 @@ F83D4E     (base 16)		Softlink Automation System Co., Ltd
 
 74-D4-35   (hex)		GIGA-BYTE TECHNOLOGY CO.,LTD.
 74D435     (base 16)		GIGA-BYTE TECHNOLOGY CO.,LTD.
-				Pin-Jen City, Taoyuan, Taiwan, R.O.C.
+				Pin-Jen City, Taoyuan, Taiwan.
 				Pin-Jen  Taoyuan  324
 				TW
 
@@ -14917,7 +14917,7 @@ A01917     (base 16)		Bertel S.p.a.
 
 F8-7B-62   (hex)		FASTWEL INTERNATIONAL CO., LTD. Taiwan Branch
 F87B62     (base 16)		FASTWEL INTERNATIONAL CO., LTD. Taiwan Branch
-				6F., No.118, Ln. 235, Baociao Rd., Sindian City, Taipei County 231, Taiwan  R.O.C.
+				6F., No.118, Ln. 235, Baociao Rd., Sindian City, Taipei County 231, Taiwan
 				Taipei    231
 				TW
 
@@ -15577,7 +15577,7 @@ EC1A59     (base 16)		Belkin International Inc.
 
 68-B6-FC   (hex)		Hitron Technologies. Inc
 68B6FC     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -15775,7 +15775,7 @@ C0B357     (base 16)		Yoshiki Electronics Industry Ltd.
 
 D0-AE-EC   (hex)		Alpha Networks Inc.
 D0AEEC     (base 16)		Alpha Networks Inc.
-				No.8 Li-shing 7th Rd., Science-based Industrial Park, Hsinchu, Taiwan, R.O.C
+				No.8 Li-shing 7th Rd., Science-based Industrial Park, Hsinchu, Taiwan
 				Hsinchu  Taiwan  300
 				TW
 
@@ -19072,7 +19072,7 @@ D4C766     (base 16)		Acentic GmbH
 
 00-25-49   (hex)		Jeorich Tech. Co.,Ltd.
 002549     (base 16)		Jeorich Tech. Co.,Ltd.
-				4F., No.6, Ln. 70, Sec. 2, Academia Rd., Nangang District, Taipei City 115, Taiwan (R.O.C.)
+				4F., No.6, Ln. 70, Sec. 2, Academia Rd., Nangang District, Taipei City 115, Taiwan
 				Taipei  Taiwan  110
 				TW
 
@@ -22330,7 +22330,7 @@ D4C766     (base 16)		Acentic GmbH
 
 00-16-40   (hex)		Asmobile Communication Inc.
 001640     (base 16)		Asmobile Communication Inc.
-				No.11 Lane 120, Li-Te Rd., Peitou 112, Taipei, Taiwan, R.O.C
+				No.11 Lane 120, Li-Te Rd., Peitou 112, Taipei, Taiwan
 				Taipei    112
 				TW
 
@@ -26342,7 +26342,7 @@ D4C766     (base 16)		Acentic GmbH
 00-D0-B9   (hex)		MICROTEK INTERNATIONAL, INC.
 00D0B9     (base 16)		MICROTEK INTERNATIONAL, INC.
 				NO. 6 INDUSTRY EAST ROAD 3
-				TAIWAN 30077  TAIWAN 30077  R.O.C.
+				TAIWAN 30077  TAIWAN 30077
 				TW
 
 00-D0-5F   (hex)		VALCOM, INC.
@@ -26888,7 +26888,7 @@ D4C766     (base 16)		Acentic GmbH
 00-04-BC   (hex)		Giantec, Inc.
 0004BC     (base 16)		Giantec, Inc.
 				4F, No. 3, Lane 123,
-				TAIWAN 231  TAIWAN 231  R.O.C.
+				TAIWAN 231  TAIWAN 231
 				TW
 
 00-04-AF   (hex)		Digital Fountain, Inc.
@@ -26966,7 +26966,7 @@ D4C766     (base 16)		Acentic GmbH
 00-04-61   (hex)		EPOX Computer Co., Ltd.
 000461     (base 16)		EPOX Computer Co., Ltd.
 				11F, #346, Chung San Rd.
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-04-62   (hex)		DAKOS Data & Communication Co., Ltd.
@@ -26978,7 +26978,7 @@ D4C766     (base 16)		Acentic GmbH
 00-04-5F   (hex)		Avalue Technology, Inc.
 00045F     (base 16)		Avalue Technology, Inc.
 				7F, 228, Lian-Cheng Road
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-04-9C   (hex)		Surgient Networks, Inc.
@@ -27128,7 +27128,7 @@ D4C766     (base 16)		Acentic GmbH
 00-03-CE   (hex)		ETEN Technologies, Inc.
 0003CE     (base 16)		ETEN Technologies, Inc.
 				2F, No. 9, Lane 235, Pao-Chiao Rd.,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-C8   (hex)		CML Emergency Services
@@ -27236,7 +27236,7 @@ D4C766     (base 16)		Acentic GmbH
 00-03-A8   (hex)		IDOT Computers, Inc.
 0003A8     (base 16)		IDOT Computers, Inc.
 				3F., No. 137, Lane 235
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-55   (hex)		TeraBeam Internet Systems
@@ -27500,7 +27500,7 @@ D4C766     (base 16)		Acentic GmbH
 00-02-8D   (hex)		Movita Technologies, Inc.
 00028D     (base 16)		Movita Technologies, Inc.
 				No. 26 Wu-Chuan 7th Road,
-				Taipei  Taiwan,  R.O.C.
+				Taipei  Taiwan
 				TW
 
 00-02-98   (hex)		Broadframe Corporation
@@ -27530,7 +27530,7 @@ D4C766     (base 16)		Acentic GmbH
 00-02-C0   (hex)		Bencent Tzeng Industry Co., Ltd.
 0002C0     (base 16)		Bencent Tzeng Industry Co., Ltd.
 				3rd fl., No. 3 Ruey Kuang Rd.,
-				Taiwan  Taiwan  R.O.C.
+				Taiwan  Taiwan
 				TW
 
 00-02-99   (hex)		Apex, Inc.
@@ -27596,7 +27596,7 @@ D4C766     (base 16)		Acentic GmbH
 00-02-44   (hex)		SURECOM Technology Co.
 000244     (base 16)		SURECOM Technology Co.
 				6F, No. 125, Sec. 2, Datung Rd.
-				Taiwan  Taiwan  R.O.C.
+				Taiwan  Taiwan
 				TW
 
 00-02-3E   (hex)		Selta Telematica S.p.a
@@ -27656,7 +27656,7 @@ D4C766     (base 16)		Acentic GmbH
 00-02-11   (hex)		Nature Worldwide Technology Corp.
 000211     (base 16)		Nature Worldwide Technology Corp.
 				No. 1, Min-Chuan Street
-				Taiwan  Taiwan  R.O.C.
+				Taiwan  Taiwan
 				TW
 
 00-02-12   (hex)		SierraCom
@@ -28463,7 +28463,7 @@ D4C766     (base 16)		Acentic GmbH
 00-30-2A   (hex)		SOUTHERN INFORMATION
 00302A     (base 16)		SOUTHERN INFORMATION
 				SYSTEM, INC.
-				HSINCHU  TAIWAN,  R.O.C.
+				HSINCHU  TAIWAN
 				TW
 
 00-30-E1   (hex)		Network Equipment Technologies, Inc.
@@ -28571,7 +28571,7 @@ D4C766     (base 16)		Acentic GmbH
 00-D0-09   (hex)		HSING TECH. ENTERPRISE CO. LTD
 00D009     (base 16)		HSING TECH. ENTERPRISE CO. LTD
 				NO.2, LANE 128, SEC. 2
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-D0-F4   (hex)		CARINTHIAN TECH INSTITUTE
@@ -28673,7 +28673,7 @@ D4C766     (base 16)		Acentic GmbH
 00-D0-7A   (hex)		AMAQUEST COMPUTER CORP.
 00D07A     (base 16)		AMAQUEST COMPUTER CORP.
 				8/F, 79 HSIN-TAI
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				TW
 
 00-50-3F   (hex)		ANCHOR GAMES
@@ -28709,7 +28709,7 @@ D4C766     (base 16)		Acentic GmbH
 00-50-70   (hex)		CHAINTECH COMPUTER CO., LTD.
 005070     (base 16)		CHAINTECH COMPUTER CO., LTD.
 				5TH F, ALLEY 2, LANE 222
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				TW
 
 00-50-23   (hex)		PG DESIGN ELECTRONICS, INC.
@@ -30179,7 +30179,7 @@ D4C766     (base 16)		Acentic GmbH
 00-A0-AE   (hex)		NUCOM SYSTEMS, INC.
 00A0AE     (base 16)		NUCOM SYSTEMS, INC.
 				9F-6, NO 4, LANE
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-A0-62   (hex)		AES PRODATA
@@ -30341,7 +30341,7 @@ D4C766     (base 16)		Acentic GmbH
 00-20-32   (hex)		ALCATEL TAISEL
 002032     (base 16)		ALCATEL TAISEL
 				4, MING SHENG STREET TU-CHENG
-				  TAIWAN  ROC
+				  TAIWAN
 				TW
 
 00-20-E9   (hex)		DANTEL
@@ -30557,7 +30557,7 @@ D4C766     (base 16)		Acentic GmbH
 00-20-F0   (hex)		UNIVERSAL MICROELECTRONICS CO.
 0020F0     (base 16)		UNIVERSAL MICROELECTRONICS CO.
 				3, 27TH RD., TAICHUNG IND.PARK
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-20-89   (hex)		T3PLUS NETWORKING, INC.
@@ -30827,7 +30827,7 @@ D4C766     (base 16)		Acentic GmbH
 00-C0-F6   (hex)		CELAN TECHNOLOGY INC.
 00C0F6     (base 16)		CELAN TECHNOLOGY INC.
 				NO. 101, MIN-HSIANG ST.
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				CN
 
 00-C0-F8   (hex)		ABOUT COMPUTING INC.
@@ -30929,7 +30929,7 @@ D4C766     (base 16)		Acentic GmbH
 00-C0-98   (hex)		CHUNTEX ELECTRONIC CO., LTD.
 00C098     (base 16)		CHUNTEX ELECTRONIC CO., LTD.
 				6F., NO.2, ALLEY 6, LANE 235
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-C0-BE   (hex)		ALCATEL - SEL
@@ -30989,7 +30989,7 @@ D4C766     (base 16)		Acentic GmbH
 00-40-3B   (hex)		SYNERJET INTERNATIONAL CORP.
 00403B     (base 16)		SYNERJET INTERNATIONAL CORP.
 				5F, NO 35, KUANG FU S. ROAD
-				TAIWAN  R.  O. C.
+				TAIWAN
 				TW
 
 00-80-3B   (hex)		APT COMMUNICATIONS, INC.
@@ -33829,14 +33829,14 @@ FC73FB     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 
 C4-54-44   (hex)		Quanta Computer Inc.
 C45444     (base 16)		Quanta Computer Inc.
-				No.211, Wen Hwa 2nd Rd., Kuei Shan Hsiang, Tao Yuan Shien, Taiwan, R. O. C.
+				No.211, Wen Hwa 2nd Rd., Kuei Shan Hsiang, Tao Yuan Shien, Taiwan
 				Taoyuan  Taiwan  33377
 				TW
 
 00-C0-9F   (hex)		Quanta Computer Inc.
 00C09F     (base 16)		Quanta Computer Inc.
 				7F., 116, HOU-KANG ST.,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-1B-24   (hex)		Quanta Computer Inc.
@@ -39217,7 +39217,7 @@ CC9F7A     (base 16)		Chiun Mai Communication Systems, Inc
 
 64-77-7D   (hex)		Hitron Technologies. Inc
 64777D     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -40352,7 +40352,7 @@ DC1A01     (base 16)		Ecoliv Technology ( Shenzhen ) Ltd.
 28-24-FF   (hex)		Wistron Neweb Corporation
 2824FF     (base 16)		Wistron Neweb Corporation
 				No.20,Park Avenue II,Hsinchu Science Park
-				Hsin-Chu  R.O.C.  308
+				Hsin-Chu  Taiwan  308
 				TW
 
 38-25-6B   (hex)		Microsoft Mobile Oy
@@ -40370,7 +40370,7 @@ DC1A01     (base 16)		Ecoliv Technology ( Shenzhen ) Ltd.
 00-02-76   (hex)		Primax Electronics Ltd.
 000276     (base 16)		Primax Electronics Ltd.
 				No. 669, Ruey Kuang Road, Neihu
-				Taipei  Taiwan,  R.O.C.
+				Taipei  Taiwan
 				TW
 
 4C-B2-1C   (hex)		Maxphotonics Co.,Ltd
@@ -41792,7 +41792,7 @@ BC44B0     (base 16)		Elastifile
 74-BF-B7   (hex)		Nusoft Corporation
 74BFB7     (base 16)		Nusoft Corporation
 				3F.-1, No. 880, Zhongzheng Rd.,
-				Zhonghe Dist., New Taipei City  Taiwan (R.O.C.)   235-86
+				Zhonghe Dist., New Taipei City  Taiwan   235-86
 				TW
 
 50-DA-00   (hex)		Hangzhou H3C Technologies Co., Limited
@@ -45373,7 +45373,7 @@ AC60B6     (base 16)		Ericsson AB
 
 1C-49-7B   (hex)		Gemtek Technology Co., Ltd.
 1C497B     (base 16)		Gemtek Technology Co., Ltd.
-				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN, REPUBLIC OF CHINA
+				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN
 				Hsinchu  TAIWAN  30352
 				TW
 
@@ -46247,7 +46247,7 @@ D80CCF     (base 16)		C.G.V. S.A.S.
 4C-BB-58   (hex)		Chicony Electronics Co., Ltd.
 4CBB58     (base 16)		Chicony Electronics Co., Ltd.
 				No.25, Wugong 6th Rd., Wugu Dist.,
-				New Taipei City 248,  TAIWAN, REPUBLIC OF CHINA  248
+				New Taipei City 248,  TAIWAN  248
 				TW
 
 A4-12-42   (hex)		NEC Platforms, Ltd.
@@ -46486,7 +46486,7 @@ A0D12A     (base 16)		AXPRO Technology Inc.
 
 20-9A-E9   (hex)		Volacomm Co., Ltd
 209AE9     (base 16)		Volacomm Co., Ltd
-				15F-6., No.7, Sec.3, New Taipei Blvd., Xinzhuang Dist., New Taipei City 242., Taiwan (R.O.C)
+				15F-6., No.7, Sec.3, New Taipei Blvd., Xinzhuang Dist., New Taipei City 242., Taiwan
 				Xinzhuang Dist.  New Taipei City  242
 				TW
 
@@ -48370,7 +48370,7 @@ B889CA     (base 16)		ILJIN ELECTRIC Co., Ltd.
 
 D0-4C-C1   (hex)		SINTRONES Technology Corp.
 D04CC1     (base 16)		SINTRONES Technology Corp.
-				14F.-3, No.736, Zhongzheng Rd., Zhonghe Dist., New Taipei City 235, Taiwan (R.O.C.)
+				14F.-3, No.736, Zhongzheng Rd., Zhonghe Dist., New Taipei City 235, Taiwan
 				Taipei  N/A  235
 				TW
 
@@ -50611,7 +50611,7 @@ F4E142     (base 16)		Delta Elektronika BV
 
 AC-81-12   (hex)		Gemtek Technology Co., Ltd.
 AC8112     (base 16)		Gemtek Technology Co., Ltd.
-				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN, REPUBLIC OF CHINA
+				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN
 				Hsinchu  TAIWAN  30352
 				TW
 
@@ -51751,7 +51751,7 @@ D4AAFF     (base 16)		MICRO WORLD
 
 00-26-5B   (hex)		Hitron Technologies. Inc
 00265B     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -60386,7 +60386,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-04-0F   (hex)		Asus Network Technologies, Inc.
 00040F     (base 16)		Asus Network Technologies, Inc.
 				11-1, No. 675, Sec. 1, King-kuo Rd.,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-04-0A   (hex)		Sage Systems
@@ -60458,7 +60458,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-03-B3   (hex)		IA Link Systems Co., Ltd.
 0003B3     (base 16)		IA Link Systems Co., Ltd.
 				6F-4, No. 81 Hsin Tai
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-EB   (hex)		Atrica
@@ -60590,7 +60590,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-03-88   (hex)		Fastfame Technology Co., Ltd.
 000388     (base 16)		Fastfame Technology Co., Ltd.
 				7F, No. 111, Hsing De Rd.,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-59   (hex)		DigitalSis
@@ -60632,7 +60632,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-03-7E   (hex)		PORTech Communications, Inc.
 00037E     (base 16)		PORTech Communications, Inc.
 				150, Shiang-Shung N. Rd.,
-				Taichung  Taiwan  403, R.O.C.
+				Taichung  Taiwan  403
 				TW
 
 00-03-6D   (hex)		Runtop, Inc.
@@ -60704,7 +60704,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-01-A8   (hex)		Welltech Computer Co., Ltd.
 0001A8     (base 16)		Welltech Computer Co., Ltd.
 				13F-4, no. 150, Jian Yi Road
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-0C   (hex)		Telesoft Technologies Ltd.
@@ -60884,7 +60884,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-02-7A   (hex)		IOI Technology Corporation
 00027A     (base 16)		IOI Technology Corporation
 				4F-3 No. 125 Lane 235,
-				Taipei  TAIWAN,  R.O.C.
+				Taipei  TAIWAN
 				TW
 
 00-02-74   (hex)		Tommy Technologies Corp.
@@ -60914,7 +60914,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-02-72   (hex)		CC&C Technologies, Inc.
 000272     (base 16)		CC&C Technologies, Inc.
 				8F, 150, Chien I Rd., Chung Ho City,
-				Taipei County 235  Taiwan  R.O.C.
+				Taipei County 235  Taiwan
 				TW
 
 00-02-6D   (hex)		Adept Telecom
@@ -60926,7 +60926,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-02-6B   (hex)		BCM Computers Co., Ltd.
 00026B     (base 16)		BCM Computers Co., Ltd.
 				6F-6, No. 66, Sec 2,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-02-93   (hex)		Solid Data Systems
@@ -60944,7 +60944,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-01-2F   (hex)		Twinhead International Corp
 00012F     (base 16)		Twinhead International Corp
 				2FL, 2, Lane 235, Bao-Chiao Road
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-02-A7   (hex)		Vivace Networks
@@ -61076,7 +61076,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-01-EF   (hex)		Camtel Technology Corp.
 0001EF     (base 16)		Camtel Technology Corp.
 				No. 2, Wu-Kung 5 Rd., Wu-Ku
-				Taiwan  Taiwan  R.O.C.
+				Taiwan  Taiwan
 				TW
 
 00-02-0A   (hex)		Gefran Spa
@@ -61202,7 +61202,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-01-B7   (hex)		Centos, Inc.
 0001B7     (base 16)		Centos, Inc.
 				6F-1, NO. 15, LANE 360
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-01-B5   (hex)		Turin Networks, Inc.
@@ -61436,7 +61436,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-30-54   (hex)		CASTLENET TECHNOLOGY, INC.
 003054     (base 16)		CASTLENET TECHNOLOGY, INC.
 				NO. 130 WU-KUNG RD.,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-30-0B   (hex)		mPHASE Technologies, Inc.
@@ -61568,7 +61568,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-30-00   (hex)		ALLWELL TECHNOLOGY CORP.
 003000     (base 16)		ALLWELL TECHNOLOGY CORP.
 				4F, #15, LANE3, SEC.2
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-30-11   (hex)		HMS Industrial Networks   
@@ -61766,7 +61766,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-D0-03   (hex)		COMDA ENTERPRISES CORP.
 00D003     (base 16)		COMDA ENTERPRISES CORP.
 				2F, NO. 501-18, CHUNGCHEN ROAD
-				TAIWAN  TAIWAN  ROC
+				TAIWAN  TAIWAN
 				TW
 
 00-D0-D2   (hex)		EPILOG CORPORATION
@@ -61808,7 +61808,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-D0-59   (hex)		AMBIT MICROSYSTEMS CORP.
 00D059     (base 16)		AMBIT MICROSYSTEMS CORP.
 				5F-1, 5 HSIN-AN ROAD
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-D0-FD   (hex)		OPTIMA TELE.COM, INC.
@@ -61904,7 +61904,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-D0-CD   (hex)		ATAN TECHNOLOGY INC.
 00D0CD     (base 16)		ATAN TECHNOLOGY INC.
 				#5, ALLEY 18, LANE 81,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-D0-40   (hex)		SYSMATE CO., LTD.
@@ -62000,7 +62000,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-50-45   (hex)		RIOWORKS SOLUTIONS, INC.
 005045     (base 16)		RIOWORKS SOLUTIONS, INC.
 				4F, NO.28, LANE 583
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-50-2B   (hex)		GENRAD LTD.
@@ -62024,7 +62024,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-50-2C   (hex)		SOYO COMPUTER, INC.
 00502C     (base 16)		SOYO COMPUTER, INC.
 				NO. 21 WU-KUNG 5 RD.
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-50-77   (hex)		PROLIFIC TECHNOLOGY, INC.
@@ -63422,7 +63422,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-20-FE   (hex)		TOPWARE INC. / GRAND COMPUTER
 0020FE     (base 16)		TOPWARE INC. / GRAND COMPUTER
 				CORPORATION
-				TAIPEI    R.O.C.
+				TAIPEI    TAIWAN
 				TW
 
 00-20-73   (hex)		FUSION SYSTEMS CORPORATION
@@ -64205,7 +64205,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-40-08   (hex)		A PLUS INFO CORPORATION
 004008     (base 16)		A PLUS INFO CORPORATION
 				5F, NO.2, LANE 235
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-40-B5   (hex)		VIDEO TECHNOLOGY COMPUTERS LTD
@@ -64403,7 +64403,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-80-3F   (hex)		TATUNG COMPANY
 00803F     (base 16)		TATUNG COMPANY
 				22 CHUNGSHANG N. RD. 3RD SEC.
-				TAIPEI  TAIWAN  R.O.C.
+				TAIPEI  TAIWAN
 				TW
 
 00-80-E6   (hex)		PEER NETWORKS, INC.
@@ -64655,7 +64655,7 @@ D4AAFF     (base 16)		MICRO WORLD
 00-00-21   (hex)		SUREMAN COMP. & COMMUN. CORP.
 000021     (base 16)		SUREMAN COMP. & COMMUN. CORP.
 				10F-5 NO. 7,  SEC. 3
-				TAIPEI  TAIWAN,  R.O.C.
+				TAIPEI  TAIWAN
 				TW
 
 00-00-30   (hex)		VG LABORATORY SYSTEMS LTD
@@ -73340,7 +73340,7 @@ C80CC8     (base 16)		HUAWEI TECHNOLOGIES CO.,LTD
 AC-83-F3   (hex)		AMPAK Technology, Inc.
 AC83F3     (base 16)		AMPAK Technology, Inc.
 				No.1,Jen Ai Road Hsinchu Industrial Park, Hukou
-				Hsinchu  Taiwan ROC.  30352 
+				Hsinchu  Taiwan  30352 
 				TW
 
 CC-8C-DA   (hex)		Shenzhen Wei Da Intelligent Technology Go.,Ltd
@@ -73358,7 +73358,7 @@ D436DB     (base 16)		Jiangsu Toppower Automotive Electronics Co., Ltd
 2C-DC-AD   (hex)		Wistron Neweb Corporation
 2CDCAD     (base 16)		Wistron Neweb Corporation
 				No.20,Park Avenue II,Hsinchu Science Park
-				Hsin-Chu  R.O.C.  308
+				Hsin-Chu  Taiwan  308
 				TW
 
 6C-5C-14   (hex)		GUANGDONG OPPO MOBILE TELECOMMUNICATIONS CORP.,LTD
@@ -74474,7 +74474,7 @@ B03EB0     (base 16)		MICRODIA Ltd.
 98-FD-B4   (hex)		Primax Electronics Ltd.
 98FDB4     (base 16)		Primax Electronics Ltd.
 				No. 669, Ruey Kuang Road, Neihu
-				Taipei  Taiwan,  R.O.C.
+				Taipei  Taiwan
 				TW
 
 D8-C4-6A   (hex)		Murata Manufacturing Co., Ltd.
@@ -76009,7 +76009,7 @@ A8A089     (base 16)		Tactical Communications
 
 48-36-5F   (hex)		Wintecronics Ltd.
 48365F     (base 16)		Wintecronics Ltd.
-				Rm. 3, 11F., No.716, Zhongzheng Rd., Zhonghe Dist., New Taipei City 23552, Taiwan (R.O.C.)
+				Rm. 3, 11F., No.716, Zhongzheng Rd., Zhonghe Dist., New Taipei City 23552, Taiwan
 				New Taipei City    23552
 				TW
 
@@ -77246,7 +77246,7 @@ F4F5D8     (base 16)		Google, Inc.
 8C-57-9B   (hex)		Wistron Neweb Corporation
 8C579B     (base 16)		Wistron Neweb Corporation
 				No.20,Park Avenue II,Hsinchu Science Park
-				Hsin-Chu  R.O.C.  308
+				Hsin-Chu  Taiwan  308
 				TW
 
 00-59-AC   (hex)		KPN. B.V.
@@ -77288,7 +77288,7 @@ F4F5D8     (base 16)		Google, Inc.
 B0-C0-90   (hex)		Chicony Electronics Co., Ltd.
 B0C090     (base 16)		Chicony Electronics Co., Ltd.
 				No.25, Wugong 6th Rd., Wugu Dist.,
-				New Taipei City 248,  TAIWAN, REPUBLIC OF CHINA  248
+				New Taipei City 248,  TAIWAN  248
 				TW
 
 90-7F-61   (hex)		Chicony Electronics Co., Ltd.
@@ -78853,7 +78853,7 @@ A0EDCD     (base 16)		Apple, Inc.
 
 F0-F2-49   (hex)		Hitron Technologies. Inc
 F0F249     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -79237,7 +79237,7 @@ ECEED8     (base 16)		ZTLX Network Technology Co.,Ltd
 
 80-EB-77   (hex)		Wistron Corporation
 80EB77     (base 16)		Wistron Corporation
-				No. 158, SingShan Rd., Neihu, Taipei 11469, Taiwan, R.O.C.
+				No. 158, SingShan Rd., Neihu, Taipei 11469, Taiwan
 				Neihu  Taipei  11469
 				
 
@@ -80401,13 +80401,13 @@ A002DC     (base 16)		Amazon Technologies Inc.
 
 54-2A-A2   (hex)		Alpha Networks Inc.
 542AA2     (base 16)		Alpha Networks Inc.
-				No.8 Li-shing 7th Rd., Science-based Industrial Park, Hsinchu, Taiwan, R.O.C
+				No.8 Li-shing 7th Rd., Science-based Industrial Park, Hsinchu, Taiwan
 				Hsinchu  Taiwan  300
 				TW
 
 84-94-8C   (hex)		Hitron Technologies. Inc
 84948C     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -81715,7 +81715,7 @@ DC7014     (base 16)		Private
 
 78-8D-F7   (hex)		Hitron Technologies. Inc
 788DF7     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -82873,7 +82873,7 @@ AC40EA     (base 16)		C&T Solution Inc.
 
 BC-14-01   (hex)		Hitron Technologies. Inc
 BC1401     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -87634,7 +87634,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 
 00-1E-53   (hex)		Further Tech Co., LTD
 001E53     (base 16)		Further Tech Co., LTD
-				8F,NO 421, Sungshan RD.,Taipei, Taiwn,R.O.C.
+				8F,NO 421, Sungshan RD.,Taipei, Taiwn
 				Taipei    110
 				TW
 
@@ -94130,7 +94130,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-04-29   (hex)		Pixord Corporation
 000429     (base 16)		Pixord Corporation
 				6F, No. 12, Innovation 1st Rd.,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-04-26   (hex)		Autosys
@@ -94166,7 +94166,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-04-83   (hex)		Deltron Technology, Inc.
 000483     (base 16)		Deltron Technology, Inc.
 				8F-3, No. 125, Lane 235
-				Taipei  TAIWAN,  R.O.C.
+				Taipei  TAIWAN
 				TW
 
 00-04-41   (hex)		Half Dome Systems, Inc.
@@ -94682,7 +94682,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-02-62   (hex)		Soyo Group Soyo Com Tech Co., Ltd
 000262     (base 16)		Soyo Group Soyo Com Tech Co., Ltd
 				5H. No. 21 Wu-gong 5 Rd,
-				Taipei Hsien  Taiwan  R.O.C.
+				Taipei Hsien  Taiwan
 				TW
 
 00-02-65   (hex)		Virditech Co. Ltd.
@@ -94718,7 +94718,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-02-96   (hex)		Lectron Co,. Ltd.
 000296     (base 16)		Lectron Co,. Ltd.
 				9F, No.171, Sec. 2, Tatung Rd.,
-				Taiwan  Taiwan  R.O.C.
+				Taiwan  Taiwan
 				TW
 
 00-02-8E   (hex)		Rapid 5 Networks, Inc.
@@ -94916,7 +94916,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-01-4D   (hex)		Shin Kin Enterprises Co., Ltd
 00014D     (base 16)		Shin Kin Enterprises Co., Ltd
 				7, FU Hsing St. Tue Cheng Ind.
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-01-DA   (hex)		WINCOMM Corporation
@@ -95270,7 +95270,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-30-69   (hex)		IMPACCT TECHNOLOGY CORP.
 003069     (base 16)		IMPACCT TECHNOLOGY CORP.
 				2F, NO. 12, R&D RD. II
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-30-C3   (hex)		FLUECKIGER ELEKTRONIK AG
@@ -95288,7 +95288,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-30-10   (hex)		VISIONETICS INTERNATIONAL
 003010     (base 16)		VISIONETICS INTERNATIONAL
 				3F, NO. 3, PROSPERITY ROAD 1
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				TW
 
 00-30-D9   (hex)		DATACORE SOFTWARE CORP.
@@ -95342,7 +95342,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-30-AB   (hex)		DELTA NETWORKS, INC.
 0030AB     (base 16)		DELTA NETWORKS, INC.
 				8, KON JAN WEST ROAD
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-30-49   (hex)		BRYANT TECHNOLOGY, LTD.
@@ -95468,7 +95468,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-D0-17   (hex)		SYNTECH INFORMATION CO., LTD.
 00D017     (base 16)		SYNTECH INFORMATION CO., LTD.
 				8F, 210, TA-TUNG RD., SEC. 3
-				TAIWAN  TAIWAN  ROC
+				TAIWAN  TAIWAN
 				TW
 
 00-D0-36   (hex)		TECHNOLOGY ATLANTA CORP.
@@ -95498,7 +95498,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-D0-61   (hex)		TREMON ENTERPRISES CO., LTD.
 00D061     (base 16)		TREMON ENTERPRISES CO., LTD.
 				15F, NO. 116, SEC. 1
-				TAIWAN  TAIWAN  ROC
+				TAIWAN  TAIWAN
 				TW
 
 00-D0-E5   (hex)		SOLIDUM SYSTEMS CORP.
@@ -97217,7 +97217,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-A0-4B   (hex)		TFL LAN INC.
 00A04B     (base 16)		TFL LAN INC.
 				9F, NO. 499 CHUNG CHENG ROAD
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-A0-64   (hex)		KVB/ANALECT
@@ -97565,7 +97565,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-20-27   (hex)		MING FORTUNE INDUSTRY CO., LTD
 002027     (base 16)		MING FORTUNE INDUSTRY CO., LTD
 				4F, NO. 800 CHUNG CHENG RD,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-20-8A   (hex)		SONIX COMMUNICATIONS, LTD.
@@ -97583,13 +97583,13 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-20-02   (hex)		SERITECH ENTERPRISE CO., LTD.
 002002     (base 16)		SERITECH ENTERPRISE CO., LTD.
 				FL. 182, NO. 531-1
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-20-4B   (hex)		AUTOCOMPUTER CO., LTD.
 00204B     (base 16)		AUTOCOMPUTER CO., LTD.
 				NO. 18, PEI YUAN ROAD
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-20-EA   (hex)		EFFICIENT NETWORKS, INC.
@@ -97655,7 +97655,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-20-2C   (hex)		WELLTRONIX CO., LTD.
 00202C     (base 16)		WELLTRONIX CO., LTD.
 				3F, NO. 36-1, HWANG HSI STREET
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-20-21   (hex)		ALGORITHMS SOFTWARE PVT. LTD.
@@ -97895,7 +97895,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-C0-D1   (hex)		COMTREE TECHNOLOGY CORPORATION
 00C0D1     (base 16)		COMTREE TECHNOLOGY CORPORATION
 				5F-7, NO. 1, FU-HSING NORTH RD
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				CN
 
 00-C0-38   (hex)		RASTER IMAGE PROCESSING SYSTEM
@@ -98051,7 +98051,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-40-38   (hex)		TALENT ELECTRIC INCORPORATED
 004038     (base 16)		TALENT ELECTRIC INCORPORATED
 				3RD FL., NO. 260, PA TEH ROAD
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-40-D8   (hex)		OCEAN OFFICE AUTOMATION LTD.
@@ -98117,7 +98117,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-40-06   (hex)		SAMPO TECHNOLOGY CORPORATION
 004006     (base 16)		SAMPO TECHNOLOGY CORPORATION
 				26-2 TING-HU,
-				33334 TAIWAN  33334 TAIWAN  R.O.C.
+				33334 TAIWAN  33334 TAIWAN
 				TW
 
 00-80-AA   (hex)		MAXPEED
@@ -98237,7 +98237,7 @@ D8D67E     (base 16)		GSK CNC EQUIPMENT CO.,LTD
 00-80-C6   (hex)		NATIONAL DATACOMM CORPORATION
 0080C6     (base 16)		NATIONAL DATACOMM CORPORATION
 				2F, 28, INDUSTRY EAST 9TH RD.
-				TAIWAN  30077  TAIWAN  30077  R.O.C.
+				TAIWAN  30077  TAIWAN  30077
 				TW
 
 00-80-C0   (hex)		PENRIL DATACOMM
@@ -105892,7 +105892,7 @@ D8C06A     (base 16)		Hunantv.com Interactive Entertainment Media Co.,Ltd.
 
 AC-20-2E   (hex)		Hitron Technologies. Inc
 AC202E     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -105947,7 +105947,7 @@ AC202E     (base 16)		Hitron Technologies. Inc
 E0-37-BF   (hex)		Wistron Neweb Corporation
 E037BF     (base 16)		Wistron Neweb Corporation
 				No.20,Park Avenue II,Hsinchu Science Park
-				Hsin-Chu  R.O.C.  308
+				Hsin-Chu  308
 				TW
 
 E8-13-67   (hex)		AIRSOUND Inc.
@@ -107668,7 +107668,7 @@ BCF5AC     (base 16)		LG Electronics (Mobile Communications)
 
 A8-4E-3F   (hex)		Hitron Technologies. Inc
 A84E3F     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -108442,7 +108442,7 @@ F8DA0C     (base 16)		Hon Hai Precision Ind. Co.,Ltd.
 
 1C-1B-0D   (hex)		GIGA-BYTE TECHNOLOGY CO.,LTD.
 1C1B0D     (base 16)		GIGA-BYTE TECHNOLOGY CO.,LTD.
-				Pin-Jen City, Taoyuan, Taiwan, R.O.C.
+				Pin-Jen City, Taoyuan, Taiwan
 				Pin-Jen  Taoyuan  324
 				TW
 
@@ -112414,7 +112414,7 @@ E8F2E2     (base 16)		LG Innotek
 
 24-72-60   (hex)		IOTTECH Corp
 247260     (base 16)		IOTTECH Corp
-				4F.-1, No.55, Dongguang Rd., East Dist., Hsinchu City 300, TAIWAN ,REPUBLIC OF CHINA
+				4F.-1, No.55, Dongguang Rd., East Dist., Hsinchu City 300
 				Hsinchu  TAIWAN  300
 				TW
 
@@ -114013,7 +114013,7 @@ C098E5     (base 16)		University of Michigan
 
 0C-47-3D   (hex)		Hitron Technologies. Inc
 0C473D     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -127823,7 +127823,7 @@ A06A00     (base 16)		Verilink Corporation
 00-04-A7   (hex)		FabiaTech Corporation
 0004A7     (base 16)		FabiaTech Corporation
 				4F-3, No. 18, Lane 609
-				Taipei  Hsien,  TAIWAN R.O.C
+				Taipei  Hsien,  TAIWAN
 				TW
 
 00-04-98   (hex)		Mahi Networks
@@ -127877,7 +127877,7 @@ A06A00     (base 16)		Verilink Corporation
 00-04-36   (hex)		ELANsat Technologies, Inc.
 000436     (base 16)		ELANsat Technologies, Inc.
 				No. 11, Lane 19, Pateh Road,
-				Hsinchu  TAIWAN,  R.O.C.
+				Hsinchu  TAIWAN
 				TW
 
 00-04-32   (hex)		Voyetra Turtle Beach, Inc.
@@ -127895,7 +127895,7 @@ A06A00     (base 16)		Verilink Corporation
 00-04-37   (hex)		Powin Information Technology, Inc.
 000437     (base 16)		Powin Information Technology, Inc.
 				8F, No. 70, Zhou-Z St.
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-04-0C   (hex)		Kanno Works, Ltd.
@@ -128093,7 +128093,7 @@ A06A00     (base 16)		Verilink Corporation
 00-03-B5   (hex)		Entra Technology Co.
 0003B5     (base 16)		Entra Technology Co.
 				Fl. 3, No. 5, Alley 2,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-64   (hex)		Scenix Semiconductor, Inc.
@@ -128135,7 +128135,7 @@ A06A00     (base 16)		Verilink Corporation
 00-03-72   (hex)		ULAN
 000372     (base 16)		ULAN
 				5F-3, No. 31-1, Lane 169,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-34   (hex)		Newport Electronics
@@ -128351,7 +128351,7 @@ A06A00     (base 16)		Verilink Corporation
 00-02-32   (hex)		Avision, Inc.
 000232     (base 16)		Avision, Inc.
 				No. 20, Creation Rd. 1,
-				Hsinchu  Taiwan,  R.O.C.
+				Hsinchu  Taiwan
 				TW
 
 00-02-35   (hex)		Paragon Networks International
@@ -128375,7 +128375,7 @@ A06A00     (base 16)		Verilink Corporation
 00-02-46   (hex)		All-Win Tech Co., Ltd.
 000246     (base 16)		All-Win Tech Co., Ltd.
 				11F, No. 111-7, Hsing De Rd.,
-				Taipei Hsien  Taiwan,  R.O.C.
+				Taipei Hsien  Taiwan
 				TW
 
 00-02-3A   (hex)		ZSK Stickmaschinen GmbH
@@ -128603,7 +128603,7 @@ A06A00     (base 16)		Verilink Corporation
 00-01-80   (hex)		AOpen, Inc.
 000180     (base 16)		AOpen, Inc.
 				6F, 88, Sec.1, Hsin Tai
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-01-97   (hex)		Cisco Systems, Inc
@@ -128885,7 +128885,7 @@ A06A00     (base 16)		Verilink Corporation
 00-30-AA   (hex)		AXUS MICROSYSTEMS, INC.
 0030AA     (base 16)		AXUS MICROSYSTEMS, INC.
 				2F-4, NO.18/N. 609, SEC. 5
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-30-89   (hex)		Spectrapoint Wireless, LLC
@@ -129257,7 +129257,7 @@ A06A00     (base 16)		Verilink Corporation
 00-D0-41   (hex)		AMIGO TECHNOLOGY CO., LTD.
 00D041     (base 16)		AMIGO TECHNOLOGY CO., LTD.
 				4F-1B, NO.12, LANE 609, SEC.5,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-D0-9D   (hex)		VERIS INDUSTRIES
@@ -129335,7 +129335,7 @@ A06A00     (base 16)		Verilink Corporation
 00-50-46   (hex)		MENICX INTERNATIONAL CO., LTD.
 005046     (base 16)		MENICX INTERNATIONAL CO., LTD.
 				NO.9, MING TSUN ROAD
-				TAIWAN 310  TAIWAN 310  R.O.C.
+				TAIWAN 310  TAIWAN 310
 				TW
 
 00-50-41   (hex)		Coretronic Corporation
@@ -129407,7 +129407,7 @@ A06A00     (base 16)		Verilink Corporation
 00-50-B6   (hex)		GOOD WAY IND. CO., LTD.
 0050B6     (base 16)		GOOD WAY IND. CO., LTD.
 				5F, NO.8, ALLEY 6,
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				TW
 
 00-50-4B   (hex)		BARCONET N.V.
@@ -130961,7 +130961,7 @@ A06A00     (base 16)		Verilink Corporation
 00-C0-0C   (hex)		RELIA TECHNOLGIES
 00C00C     (base 16)		RELIA TECHNOLGIES
 				1F., NO. 24, INDUSTRY E. 9TH
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-C0-73   (hex)		XEDIA CORPORATION
@@ -131087,7 +131087,7 @@ A06A00     (base 16)		Verilink Corporation
 00-20-14   (hex)		GLOBAL VIEW CO., LTD.
 002014     (base 16)		GLOBAL VIEW CO., LTD.
 				4F, NO. 23, LANE 306
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				TW
 
 00-20-C2   (hex)		TEXAS MEMORY SYSTEMS, INC.
@@ -131117,7 +131117,7 @@ A06A00     (base 16)		Verilink Corporation
 00-20-78   (hex)		RUNTOP, INC.
 002078     (base 16)		RUNTOP, INC.
 				5/F, NO. 10, ALLEY 8, LANE 45
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				TW
 
 00-20-06   (hex)		GARRETT COMMUNICATIONS, INC.
@@ -131171,7 +131171,7 @@ A06A00     (base 16)		Verilink Corporation
 00-C0-A3   (hex)		DUAL ENTERPRISES CORPORATION
 00C0A3     (base 16)		DUAL ENTERPRISES CORPORATION
 				9TH FLOOR 48 NAN-KANG ROAD
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-C0-18   (hex)		LANART CORPORATION
@@ -131423,7 +131423,7 @@ A06A00     (base 16)		Verilink Corporation
 00-C0-6C   (hex)		SVEC COMPUTER CORP.
 00C06C     (base 16)		SVEC COMPUTER CORP.
 				3F, 531-1 CHUNG CHENG RD.
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-40-FF   (hex)		TELEBIT CORPORATION
@@ -131459,7 +131459,7 @@ A06A00     (base 16)		Verilink Corporation
 00-C0-26   (hex)		LANS TECHNOLOGY CO., LTD.
 00C026     (base 16)		LANS TECHNOLOGY CO., LTD.
 				153 MINTSU RD. 2F, TAOYUAN,
-				TAIWAN  R.  O. C.
+				TAIWAN
 				TW
 
 00-40-7E   (hex)		EVERGREEN SYSTEMS, INC.
@@ -131543,7 +131543,7 @@ A06A00     (base 16)		Verilink Corporation
 00-40-A2   (hex)		KINGSTAR TECHNOLOGY INC.
 0040A2     (base 16)		KINGSTAR TECHNOLOGY INC.
 				1-3F, NO. 185, SEC. 3,
-				TAIPEI  TAIWAN,  R.O.C.
+				TAIPEI  TAIWAN
 				TW
 
 00-40-DC   (hex)		TRITEC ELECTRONIC GMBH
@@ -131639,7 +131639,7 @@ A06A00     (base 16)		Verilink Corporation
 00-40-C7   (hex)		RUBY TECH CORPORATION
 0040C7     (base 16)		RUBY TECH CORPORATION
 				6F-1, NO.3, LANE 250,
-				TAIPEI  TAIWAN,  R.O.C.
+				TAIPEI  TAIWAN
 				TW
 
 00-40-52   (hex)		STAR TECHNOLOGIES, INC.
@@ -132035,7 +132035,7 @@ A06A00     (base 16)		Verilink Corporation
 00-80-14   (hex)		ESPRIT SYSTEMS
 008014     (base 16)		ESPRIT SYSTEMS
 				14F, NO. 1, SEC. 4
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-80-B7   (hex)		STELLAR COMPUTER
@@ -134500,7 +134500,7 @@ E8DA20     (base 16)		Nintendo Co.,Ltd
 
 54-AB-3A   (hex)		Quanta Computer Inc.
 54AB3A     (base 16)		Quanta Computer Inc.
-				No.211, Wen Hwa 2nd Rd., Kuei Shan Hsiang, Tao Yuan Shien, Taiwan, R. O. C.
+				No.211, Wen Hwa 2nd Rd., Kuei Shan Hsiang, Tao Yuan Shien, Taiwan
 				Taoyuan  Taiwan  33377
 				TW
 
@@ -136931,7 +136931,7 @@ E4DB6D     (base 16)		Beijing Xiaomi Electronics Co., Ltd.
 00-A0-D1   (hex)		INVENTEC CORPORATION
 00A0D1     (base 16)		INVENTEC CORPORATION
 				INVENTEC BUILDING
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-18-CC   (hex)		AXIOHM SAS
@@ -139903,7 +139903,7 @@ D8325A     (base 16)		Shenzhen YOUHUA Technology Co., Ltd
 
 C0-02-8D   (hex)		WINSTAR Display CO.,Ltd
 C0028D     (base 16)		WINSTAR Display CO.,Ltd
-				1F., No.77, Ln. 188, Pinghe S. Rd., Daya Dist., Taichung City 428, Taiwan (R.O.C.)
+				1F., No.77, Ln. 188, Pinghe S. Rd., Daya Dist., Taichung City 428, Taiwan
 				Taichung City    428
 				TW
 
@@ -140048,7 +140048,7 @@ F8A5C5     (base 16)		Cisco Systems, Inc
 B0-F1-EC   (hex)		AMPAK Technology, Inc.
 B0F1EC     (base 16)		AMPAK Technology, Inc.
 				No.1,Jen Ai Road Hsinchu Industrial Park, Hukou
-				Hsinchu  Taiwan ROC.  30352 
+				Hsinchu  Taiwan  30352 
 				TW
 
 54-2B-57   (hex)		Night Owl SP
@@ -140861,7 +140861,7 @@ D03DC3     (base 16)		AQ Corporation
 EC-01-E2   (hex)		FOXCONN INTERCONNECT TECHNOLOGY
 EC01E2     (base 16)		FOXCONN INTERCONNECT TECHNOLOGY
 				66-1, Chungshan Rd., Tucheng Dist.
-				New Taipei City  Taiwan (R.O.C.)    23680
+				New Taipei City  Taiwan    23680
 				TW
 
 B4-E7-82   (hex)		Vivalnk
@@ -142894,7 +142894,7 @@ E0071B     (base 16)		Hewlett Packard Enterprise
 
 1C-AB-C0   (hex)		Hitron Technologies. Inc
 1CABC0     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -143092,7 +143092,7 @@ AC5F3E     (base 16)		SAMSUNG ELECTRO-MECHANICS(THAILAND)
 
 28-0C-28   (hex)		Unigen DataStorage Corporation
 280C28     (base 16)		Unigen DataStorage Corporation
-				11F.-6, No.251, Fuxing 1st St., Zhubei City, Hsinchu County 302, Taiwan (R.O.C.)
+				11F.-6, No.251, Fuxing 1st St., Zhubei City, Hsinchu County 302, Taiwan
 				Zhubei City    30271
 				TW
 
@@ -143477,7 +143477,7 @@ F88E85     (base 16)		Comtrend Corporation
 00-30-FF   (hex)		DataFab Systems Inc.
 0030FF     (base 16)		DataFab Systems Inc.
 				ROOM #1910, 19F, NO. 333
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-0F-F6   (hex)		DARFON LIGHTING CORP
@@ -147088,7 +147088,7 @@ D00492     (base 16)		Fiberhome Telecommunication Technologies Co.,LTD
 
 00-FC-8D   (hex)		Hitron Technologies. Inc
 00FC8D     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -147526,7 +147526,7 @@ FCAFAC     (base 16)		Socionext Inc.
 
 BC-4D-FB   (hex)		Hitron Technologies. Inc
 BC4DFB     (base 16)		Hitron Technologies. Inc
-				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan, R.O.C
+				No. 1-8, Lising 1st Rd. Hsinchu Science Park, Hsinchu, 300, Taiwan
 				Hsin-chu  Taiwan  300
 				TW
 
@@ -147874,7 +147874,7 @@ BC9CC5     (base 16)		Beijing Huafei Technology Co., Ltd.
 
 FC-AA-14   (hex)		GIGA-BYTE TECHNOLOGY CO.,LTD.
 FCAA14     (base 16)		GIGA-BYTE TECHNOLOGY CO.,LTD.
-				Pin-Jen City, Taoyuan, Taiwan, R.O.C.
+				Pin-Jen City, Taoyuan, Taiwan
 				Pin-Jen  Taoyuan  324
 				TW
 
@@ -149101,7 +149101,7 @@ E880D8     (base 16)		GNTEK Electronics Co.,Ltd.
 
 F8-35-DD   (hex)		Gemtek Technology Co., Ltd.
 F835DD     (base 16)		Gemtek Technology Co., Ltd.
-				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN, REPUBLIC OF CHINA
+				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN
 				Hsinchu  TAIWAN  30352
 				TW
 
@@ -149654,7 +149654,7 @@ B49842     (base 16)		zte corporation
 64-5A-04   (hex)		Chicony Electronics Co., Ltd.
 645A04     (base 16)		Chicony Electronics Co., Ltd.
 				No.25, Wugong 6th Rd., Wugu Dist.,
-				New Taipei City 248,  TAIWAN, REPUBLIC OF CHINA  248
+				New Taipei City 248,  TAIWAN  248
 				TW
 
 AC-17-02   (hex)		Fibar Group sp. z o.o.
@@ -149731,7 +149731,7 @@ B4DF3B     (base 16)		Chromlech
 
 84-E7-14   (hex)		Liang Herng Enterprise,Co.Ltd.
 84E714     (base 16)		Liang Herng Enterprise,Co.Ltd.
-				1FL,No.27,KweiYang Street,Sanchung District,New Taipei City,Taiwan,R.O.C. 
+				1FL,No.27,KweiYang Street,Sanchung District,New Taipei City,Taiwan 
 				New Taipei City    241
 				TW
 
@@ -149804,7 +149804,7 @@ DC028E     (base 16)		zte corporation
 A8-45-E9   (hex)		Firich Enterprises CO., LTD.
 A845E9     (base 16)		Firich Enterprises CO., LTD.
 				10F., No. 75, Sec. 1, Xintai 5th Rd., Xizhi Dist.
-				New Taipei City  Taiwan (R.O.C.)  886
+				New Taipei City  Taiwan  886
 				TW
 
 48-52-61   (hex)		SOREEL
@@ -150320,7 +150320,7 @@ D4DF57     (base 16)		Alpinion Medical Systems
 B4-0E-96   (hex)		HERAN 
 B40E96     (base 16)		HERAN 
 				No.88, Keji 3rd Rd., Guishan Township
-				Taoyuan  R.O.C  333
+				Taoyuan  Taiwan  333
 				TW
 
 50-8C-77   (hex)		DIRMEIER Schanktechnik GmbH &Co KG
@@ -150931,7 +150931,7 @@ AC319D     (base 16)		Shenzhen TG-NET Botone Technology Co.,Ltd.
 
 20-10-7A   (hex)		Gemtek Technology Co., Ltd.
 20107A     (base 16)		Gemtek Technology Co., Ltd.
-				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN, REPUBLIC OF CHINA
+				No. 1 Jen Ai Road Hsinchu Industrial Park Hukou, Hsinchu 30352 TAIWAN
 				Hsinchu  TAIWAN  30352
 				TW
 
@@ -161417,7 +161417,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-04-ED   (hex)		Billion Electric Co., Ltd.
 0004ED     (base 16)		Billion Electric Co., Ltd.
 				8F, No.192, Sec.2, Chung Hsing Rd.,
-				Taiwan  Taiwan  ROC
+				Taiwan  Taiwan
 				TW
 
 00-04-E7   (hex)		Lightpointe Communications, Inc
@@ -161699,7 +161699,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-03-91   (hex)		Advanced Digital Broadcast, Ltd.
 000391     (base 16)		Advanced Digital Broadcast, Ltd.
 				8F, 145 Chung Shan N. Rd. Sec. 2,
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-03-AC   (hex)		Fronius Schweissmaschinen
@@ -161951,7 +161951,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-02-B6   (hex)		Acrosser Technology Co., Ltd.
 0002B6     (base 16)		Acrosser Technology Co., Ltd.
 				No. 116-2 Guang-Fu Rd.
-				Taipei  Taipei  R.O.C.
+				Taipei  Taipei Taiwan
 				TW
 
 00-02-B1   (hex)		Anritsu, Ltd.
@@ -162227,7 +162227,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-01-EB   (hex)		C-COM Corporation
 0001EB     (base 16)		C-COM Corporation
 				3F, No. 48, Park Ave. II SBIP
-				Hsinchu Taiwan  Hsinchu Taiwan  R.O.C.
+				Hsinchu Taiwan  Hsinchu Taiwan
 				TW
 
 00-01-F2   (hex)		Mark of the Unicorn, Inc.
@@ -162773,7 +162773,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-30-DC   (hex)		RIGHTECH CORPORATION
 0030DC     (base 16)		RIGHTECH CORPORATION
 				4F, NO. 351, CHUNG-SHUN RD.
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-30-25   (hex)		CHECKOUT COMPUTER SYSTEMS, LTD
@@ -162869,7 +162869,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-30-3C   (hex)		ONNTO CORP.
 00303C     (base 16)		ONNTO CORP.
 				12F-2,  NO. 161
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-30-24   (hex)		Cisco Systems, Inc
@@ -162971,7 +162971,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-D0-70   (hex)		LONG WELL ELECTRONICS CORP.
 00D070     (base 16)		LONG WELL ELECTRONICS CORP.
 				4F, NO. 59-1, TSAO DI WEI
-				TAIWAN 222  TAIWAN 222  R.O.C.
+				TAIWAN 222  TAIWAN 222
 				TW
 
 00-D0-29   (hex)		WAKEFERN FOOD CORPORATION
@@ -165077,7 +165077,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-C0-36   (hex)		RAYTECH ELECTRONIC CORP.
 00C036     (base 16)		RAYTECH ELECTRONIC CORP.
 				2F, NO.6, LANE 497
-				  TAIWAN  R.O.C.
+				  TAIWAN
 				TW
 
 00-C0-A2   (hex)		INTERMEDIUM A/S
@@ -165341,7 +165341,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-40-95   (hex)		R.P.T. INTERGROUPS INT'L LTD.
 004095     (base 16)		R.P.T. INTERGROUPS INT'L LTD.
 				9F, 50 MIN CHUAN RD
-				TAIWAN  TAIWAN  R.O.C.
+				TAIWAN  TAIWAN
 				TW
 
 00-40-35   (hex)		OPCOM
@@ -165359,7 +165359,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-40-61   (hex)		DATATECH ENTERPRISES CO., LTD.
 004061     (base 16)		DATATECH ENTERPRISES CO., LTD.
 				(LIN KOU INDUSTRIAL ZONE SEC,4
-				TAOYUAN COUNTY  TAIWAN  R.O.C.
+				TAOYUAN COUNTY  TAIWAN
 				TW
 
 00-00-8C   (hex)		Alloy Computer Products (Australia) Pty Ltd
@@ -165851,7 +165851,7 @@ EC6C9F     (base 16)		Chengdu Volans Technology CO.,LTD
 00-00-F7   (hex)		YOUTH KEEP ENTERPRISE CO LTD
 0000F7     (base 16)		YOUTH KEEP ENTERPRISE CO LTD
 				3/F NO. 712 MINTSU E. ROAD
-				    ROC
+				    TAIWAN
 				TW
 
 00-00-C7   (hex)		ARIX CORPORATION
-- 
2.27.0