Merge branch 'tomato-miscset' into tomato-RT-usbmod-base
commit4ee19d550e7e648c4a8a5b6172dc265f75acc677
authorFedor <fedork@ubuntu.(none)>
Wed, 30 Dec 2009 01:46:45 +0000 (29 20:46 -0500)
committerFedor <fedork@ubuntu.(none)>
Wed, 30 Dec 2009 01:46:45 +0000 (29 20:46 -0500)
tree7ef885d8bb43d22449af8c2412776ce42dd31b13
parenta2ac12307fc58b71e3c13ca42036121ee269f573
parent938cbb727174d5f248a109eaaa0d53bee0855354
Merge branch 'tomato-miscset' into tomato-RT-usbmod-base

Conflicts:

release/src/router/httpd/tomato.c
release/src/router/rc/init.c
release/src/linux/linux/.config
release/src/router/httpd/tomato.c
release/src/router/httpd/tomato.h
release/src/router/nvram/defaults.c
release/src/router/rc/firewall.c
release/src/router/rc/init.c
release/src/router/rc/misc.c
release/src/router/rc/rc.h
release/src/router/rc/telssh.c
release/src/router/www/admin-access.asp