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

diff --cc lisp/ChangeLog
index e4556ac,c6e7108..85d900b
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,9 -1,12 +1,16 @@@
 +2010-11-25  Katsumi Yamaoka  <yamaoka@jpl.org>
 +
 +      * shr.el (shr-insert): Fix the way to fold lines.
 +
  2010-11-25  Julien Danjou  <julien@danjou.info>
  
+       * shr-color.el (shr-color->hexadecimal): Use color-rgb->hex
+ 
+       * color.el: Rename from color-lab.el
+       (color-rgb->hex): Add.
+       (color-complement): Add.
+       (color-complement-hex): Add.
+ 
        * gnus-sum.el (gnus-summary-widget-forward): Add, and bind to [tab].
  
  2010-11-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>