Merge from trunk.
commitd0672f86c94e9dbf52e783e2bc4162b9cf3b5f44
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:20:09 +0000 (30 22:20 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 05:20:09 +0000 (30 22:20 -0700)
treee0e9fc7f479bce996d52c4356052480b3a088c56
parentb9444d97feca73cb2a90559241bc79584692da54
parentbbc6b304672eb229e6750692a1b4e83277ded115
Merge from trunk.
lisp/ChangeLog
lisp/gnus/ChangeLog