Merge branch 'net-const'
authorJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 03:22:45 +0000 (22:22 -0500)
committerJeff Garzik <jeff@garzik.org>
Sat, 4 Mar 2006 03:22:45 +0000 (22:22 -0500)

Trivial merge