Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 128)

   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 257-258)

   - Merge from emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-897

diff --cc lisp/gnus/ChangeLog
index 89d9d75,9d95f0a..59a3292
--- 1/lisp/gnus/ChangeLog
--- 2/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@@ -1,19 -1,15 +1,31 @@@
+ 2007-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * gnus-util.el (gnus-string<): New function.
+ 
+       * gnus-sum.el (gnus-article-sort-by-author)
+       (gnus-article-sort-by-subject): Use it.
+ 
+ 2007-10-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+ 
+       * gnus-win.el (gnus-configure-windows): Focus on the frame for which
+       the frame-focus tag is set in gnus-buffer-configuration.
+ 
 +2007-10-04  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * sieve-manage.el (sieve-manage-interactive-login): Doc fix.
 +      (sieve-manage-open): Use `mapc' instead of `mapcar'.
 +
 +2007-10-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * gnus-uu.el (gnus-uu-reginize-string, gnus-uu-expand-numbers):
 +      Don't hardcode point-min==1.
 +
 +2007-09-30  David Kastrup  <dak@gnu.org>
 +
 +      * gnus-art.el (gnus-article-reply-with-original)
 +      (gnus-article-followup-with-original): When `transient-mark-mode' is
 +      off, refrain from active-region behavior for followups.
 +
  2007-10-08  Reiner Steib  <Reiner.Steib@gmx.de>
  
        * mm-util.el (mm-charset-synonym-alist): Alias gbk to cp936.