diff --git a/ChangeLog b/ChangeLog
index 259dfe510..43ec1483f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-30  Matthias Clasen  <mclasen@redhat.com>
+
+	Merged from trunk:
+
+	* glib/gtestutils.c: Fix a doc typo. (#524742, Hiroyuki Ikezoe)
+
 2008-03-20  Alexander Larsson  <alexl@redhat.com>
 
         * configure.in:
diff --git a/glib/gtestutils.c b/glib/gtestutils.c
index 508d53d2d..13f670dd0 100644
--- a/glib/gtestutils.c
+++ b/glib/gtestutils.c
@@ -1446,7 +1446,7 @@ test_time_stamp (void)
  * In the following example, the test code forks, the forked child
  * process produces some sample output and exits successfully.
  * The forking parent process then asserts successfull child program
- * termination and validates cihld program outputs.
+ * termination and validates child program outputs.
  *
  * |[
  *   static void