Merge from 2.0.1

svn: r4666
2005-05-24 13:08:06 +00:00
1 parent 62c65fb454
commit d7ce524379
@@ -60,9 +60,9 @@
 1 SEX M
 1 TITL Grand Poobah
 1 OBJE
-2 FROM jpeg
+2 FORM jpeg
 2 FILE foo/O0.jpg
-1 BIRT
+1 BIRT Edwin Michael Smith's Birth event
 2 DATE 24 MAY 1961
 2 PLAC San Jose, Santa Clara Co., CA
 1 OCCU
@@ -88,7 +88,7 @@
 2 SOUR @S1601@
 1 SEX F
 1 OBJE
-2 FROM jpeg
+2 FORM jpeg
 2 FILE foo/O0.jpg
 1 BIRT
 2 DATE 22 NOV 1933