Merge pobox.com:/garz/repo/netdev-2.6/r8169
into pobox.com:/garz/repo/net-drivers-2.6