diff --git a/ChangeLog b/ChangeLog
index a38ed2090..316059e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-19  Werner Lemberg  <wl@gnu.org>
+
+	* src/base/ftoutln.c (FT_Vector_Transform): Fix serious typo
+	(xy <-> yx).
+	* src/truetype/ttgload.c (load_truetype_glyph): Replace `|' with
+	`||' to make code easier to read.
+
 2002-06-18  Roberto Alameda  <ojancano@geekmail.de>.
 
 	* src/type42/t42objs.c (t42_check_size_change): Removed.
@@ -24,7 +31,7 @@
 
 2002-06-16  Leonard Rosenthol  <leonardr@lazerware.com>
 
-	Updated Win32/VC++ projects to include the new PFR driver
+	Updated Win32/VC++ projects to include the new PFR driver.
 
 	* builds\win32\visualc\freetype.dsp: Updated.
 
diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c
index f9a806ff6..cbf2e0f24 100644
--- a/src/base/ftoutln.c
+++ b/src/base/ftoutln.c
@@ -628,9 +628,9 @@
       return;
 
     xz = FT_MulFix( vector->x, matrix->xx ) +
-         FT_MulFix( vector->y, matrix->xy );
+         FT_MulFix( vector->y, matrix->yx );
 
-    yz = FT_MulFix( vector->x, matrix->yx ) +
+    yz = FT_MulFix( vector->x, matrix->xy ) +
          FT_MulFix( vector->y, matrix->yy );
 
     vector->x = xz;
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index c5c8daea9..8cb80ac7b 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -1066,7 +1066,7 @@
             }
           }
 
-          if ( x | y )
+          if ( x || y )
           {
             translate_array( num_new_points,
                              gloader->base.outline.points + num_base_points,