ftp-proxy: Update to OpenBSD 4.1 ftp-proxy has been moved from libexec/ to usr.sbin/
Merge branch 'master' into pf_update
wlan - Convert lockmgr locking to a global token. Use the lwkt_token API to synchronize the wlan layer entry points. Discussed-With: dillon