Merge bk://bk.skbuff.net:20608/linux-2.6-dgramconnect/

into nuts.davemloft.net:/disk1/BK/net-2.6

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/ipv4/udp.c
Simple merge

diff --cc net/ipv6/raw.c
Simple merge

diff --cc net/ipv6/udp.c
Simple merge