Merging r1881

svn path=/baselayout-vserver/trunk/; revision=236

1 files changed, 34 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index cda09a4..d06bb08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,37 @@
 
     Give a better error message when no valid DHCP client is installed.
 
+  08 Feb 2006; Roy Marples <uberlord@gentoo.org>:
+
+    New module ip6to4 that creates tunnels with IPv6 addresses based off
+    global IPv4 addresses on a specified interface, #122015.
+    Thanks to Antti Mäkelä for testing and ideas.
+
+  07 Feb 2006; Roy Marples <uberlord@gentoo.org>:
+
+    Always ensure the end_service is called, #119233 again.
+
+    You can now specify a maxfail value for pppd (default 0), #115346.
+
+    net.lo now depends on isapnp to work with older NICs, #121539.
+
+    chat commands in pppd are now re-quoted, #121665.
+
+    ip routing policies are now supports via the rule_eth0=( ... )
+    variable (only supported by iproute2), #107628.
+
+    wpa_supplicant now looks for config files in order
+        /etc/wpa_supplicant/wpa_supplicant-$iface.conf
+        /etc/wpa_supplicant/wpa_supplicant.conf
+        /etc/wpa_supplicant.conf
+    and for these wpa_cli scripts
+        /etc/wpa_supplicant/wpa_cli.sh
+        /sbin/wpa_cli.action
+
+  6 Feb 2006; Mike Frysinger <vapier@gentoo.org>:
+
+    Update xen checks #96240 by Tuan Van and #107976 by Chris Bainbridge.
+
   29 Jan 2006; Mike Frysinger <vapier@gentoo.org>:
 
     Update modules-update to run depmod even if /proc/modules doesn't exist
@@ -879,8 +910,9 @@
 
   19 Jul 2005; Mike Frysinger <vapier@gentoo.org>:
 
-    Punt the at/bind/cron/cyrus/ftp/games/gdm/man/mysql/qmail/slocate/squid/
-    sshd/vpopmail/xfs users/groups to the respective ebuilds.
+    Punt the at/bind/cron/cyrus/ftp/games/gdm/man/mysql/nut/postfix/postgres/
+    qmail/slocate/squid/sshd/vpopmail/xfs users/groups to the respective
+    ebuilds.
 
   19 Jul 2005; Roy Marples <uberlord@gentoo.org>: