Merge changelogs.

git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@29 456724a4-4300-0410-8514-c89748c515a2

diff --git a/doc/Changelog b/doc/Changelog
index 046117dba2327a5e2565da12478e2c4edcf9f98a..47886b0b2a5ace89497a965a82f7e186012a23ac 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,15 +1,6 @@
-  * Add the comment from Andrea Arcangeli about the correct
-    place of setting the default childhandler within spawn().
-  * Make sure that newline is printed out for last(1) even
-    if an utmp record entry is truncated.
-  * Check if utmp not only exists but also is writable and delay
-    writing out of the utmp runlevel record if utmp is not writable.
-  * Be able to find libcrypt also on 64 bit based architectures.
-
- -- Werner Fink <werner@suse.de>  Tue, 24 Nov 2009 11:04:48 +0100
-
 sysvinit (2.88dsf) UNRELEASED; urgency=low
 
+  [ Petter Reinholdtsen ]
   * Mention new home on Savannah in README.
   * Revert change from Fedora/RedHat where the now obsolete command
     INIT_CMD_CHANGECONS was introduced.  Based on feedback and patch
@@ -37,6 +28,15 @@ sysvinit (2.88dsf) UNRELEASED; urgency=low
   * Make sure bootlogd fflush() every line, even if asked not to flush
     to disk using fdatasync().  Patch from Scott Gifford via Debian.
 
+  [ Werner Fink ]
+  * Add the comment from Andrea Arcangeli about the correct
+    place of setting the default childhandler within spawn().
+  * Make sure that newline is printed out for last(1) even
+    if an utmp record entry is truncated.
+  * Check if utmp not only exists but also is writable and delay
+    writing out of the utmp runlevel record if utmp is not writable.
+  * Be able to find libcrypt also on 64 bit based architectures.
+
  -- Petter Reinholdtsen <pere@hungry.com>  Sun, 12 Jul 2009 19:58:10 +0200
 
 sysvinit (2.87dsf) world; urgency=low