merge r22988
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 9 Sep 2010 20:16:00 +0000 (20:16 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 9 Sep 2010 20:16:00 +0000 (20:16 +0000)
commitc02371ad005f38ccb0192dfc99def27b090f3372
tree186b088f7779e228eaab9d631a745f12b5a61bdd
parent6dbac9d67e4eb1b01887ca6bcdbaaeec750c41c0
merge r22988

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