merge r22602 & r22607
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 12 Aug 2010 10:58:29 +0000 (10:58 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 12 Aug 2010 10:58:29 +0000 (10:58 +0000)
commit87ba5a8dcc3afc1d8cf26a7a8d3eddde5a8221f0
tree2c7a8c19724af2c6bfa2c2531830a019746f0fe7
parent119e850ed3257d96c610bd30668722c34db0a8ee
merge r22602 & r22607

SVN-Revision: 22608
package/uhttpd/Makefile
package/uhttpd/src/uhttpd-file.c
package/uhttpd/src/uhttpd.c