ChangeLog, Makefile.in, mkjournal.c:
  Makefile.in: Link in libe2p when creating libext2fs as a shared
  	library, since mkjournal.c now references fsetflags().
  mkjournal.c (ext2fs_add_journal_inode): Folded in Andreas Dilger's
  	changes (with fixups) to allow on-line creation of a journal file.
.del-types.h.in~ca55114a:
  Change what we use to protect the header file to be _ASM_TYPES_H
  instead of _LINUX_TYPES_H.  (Needed to make libc5 builds happy).
version.h:
  Update for WIP release.

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index f89bdd9..97b9822 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,5 +1,12 @@
 2001-01-03    <tytso@snap.thunk.org>
 
+	* Makefile.in: Link in libe2p when creating libext2fs as a shared
+		library, since mkjournal.c now references fsetflags().
+
+	* mkjournal.c (ext2fs_add_journal_inode): Folded in Andreas
+		Dilger's changes (with fixups) to allow on-line creation
+		of a journal file.
+
 	* ext2fs.h, closefs.c (ext2fs_flush): Add new flag,
 		EXT2_FLAG_SUPER_ONLY, which the close routines to only
 		update the superblock, and not the group descriptors.