merge r24823
authorJo-Philipp Wich <jow@openwrt.org>
Fri, 24 Dec 2010 22:04:16 +0000 (22:04 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Fri, 24 Dec 2010 22:04:16 +0000 (22:04 +0000)
commit6fb556690dc59b7032897b6d35f9d6e0c0c355dd
treeafc08a76b7b4be6e823c1c0b7070027e0c58a33d
parent506e9396e9bf6c735d4bd533fb39a616a61fa339
merge r24823

SVN-Revision: 24824
package/uhttpd/Makefile
package/uhttpd/src/uhttpd.c