r5972 - trunk/gta02-core/bom/research

[werner at docs.openmoko.org]

Author: werner
Date: 2010-07-17 12:34:09 +0200 (Sat, 17 Jul 2010)
New Revision: 5972

Modified:
   trunk/gta02-core/bom/research/lcm
Log:
"merfed" is an interesting-looking word, doubtlessly with a lot of
potential, but "merged" may still be more understandable.



Modified: trunk/gta02-core/bom/research/lcm
===================================================================
--- trunk/gta02-core/bom/research/lcm	2010-05-31 05:53:56 UTC (rev 5971)
+++ trunk/gta02-core/bom/research/lcm	2010-07-17 10:34:09 UTC (rev 5972)
@@ -10,7 +10,7 @@
   http://investors.solarfun.com.cn/releasedetail.cfm?releaseid=284542
   http://www.marketwire.com/press-release/Display-Industry-Veteran-Dr-I-Wei-Wu-Joins-Leadis-Technologys-Board-of-Directors-NASDAQ-LDIS-828671.htm
 
-- In 2010, TPO Displays Corporation merfed with Chi Mei Optoelectronics
+- In 2010, TPO Displays Corporation merged with Chi Mei Optoelectronics
   and became Chimei Innolux Corporation
 
   http://www.chimei-innolux.com/opencms/cmo/modules/news/MCNews/mcnews_0156.html?__locale=en