Merge branch 'master' of https://git.gnus.org/gnus

diff --cc lisp/ChangeLog
index 90b197c,ea0dfa2..a9bfaf1
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,10 +1,12 @@@
+ 2010-09-25  Julien Danjou  <julien@danjou.info>
+ 
+       * gnus-html.el (gnus-html-rescale-image): Use our defalias
+       gnus-window-inside-pixel-edges.
+ 
  2010-09-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +      * gnus-srvr.el (gnus-server-copy-server): Add documentation.
 +
        * mm-decode.el (mm-save-part): Allow saving to other directories the
        normal Emacs way.