From 012884e2473bd2d9686f2cc159981729797236ef Mon Sep 17 00:00:00 2001
From: "Richard M. Stallman" <rms@gnu.org>
Date: Thu, 14 Dec 2006 15:17:37 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 5 +++++
 lisp/align.el  | 1 +
 2 files changed, 6 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7d7529c315..c758e34089b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-14  Richard Stallman  <rms@gnu.org>
+
+	* startup.el (use-fancy-splash-screens-p): Use frame-height
+	instead of window-height.  Pass frame to image-size.
+
 2006-12-13  Kenichi Handa  <handa@m17n.org>
 
 	* international/mule-cmds.el (set-locale-environment): Set
diff --git a/lisp/align.el b/lisp/align.el
index b49979059a3..a3cc531d796 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -4,6 +4,7 @@
 ;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: convenience languages lisp
 
 ;; This file is part of GNU Emacs.
-- 
2.39.5