Resolved ChangeLog merge.

diff --cc lisp/ChangeLog
index b1c5fb2,278295c..851c1c5
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,14 -1,15 +1,26 @@@
 +2011-02-24  Teodor Zlatanov  <tzz@lifelogs.com>
 +
 +      * auth-source.el (auth-source-creation-prompts): New variable to manage
 +      creation-time prompts.
 +      (auth-source-search): Document it.
 +      (auth-source-format-prompt): Add utility function.
 +      (auth-source-netrc-create): Don't default the user name to
 +      user-login-name.  Use `auth-source-creation-prompts' and some default
 +      prompts for user, host, port, and password (the default generic prompt
 +      remains ugly).
 +
+ 2011-02-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * auth-source.el (auth-source-netrc-create): Use `read-char' with no
+       argument that XEmacs doesn't support.
+ 
+       * dgnushack.el (dgnushack-compile): Exclude color.el from being
+       compiled for Emacsen having no `libxml-parse-html-region' support.
+ 
+       * gnus-xmas.el (gnus-xmas-define): Remove gnus-x-color-values.
+ 
+       * lpath.el: Bind buffer-save-without-query for XEmacs.
+ 
  2011-02-23  Julien Danjou  <julien@danjou.info>
  
        * gnus-art.el (article-make-date-line): Ignore errors if time is

diff --cc lisp/auth-source.el
Simple merge