[backfire] merge r28149
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 2 Sep 2011 13:30:23 +0000 (13:30 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Fri, 2 Sep 2011 13:30:23 +0000 (13:30 +0000)
commit7ef8101d588ff5569e9b80eac359bde9fbfcc8d3
tree6e76ce62ac14d9f3ef0f3b7ae4754662d3a1212c
parent7d6e37061b37fd0201ab28e187fe2f8c4a9a2b9a
[backfire] merge r28149

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28150 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/uhttpd/Makefile
package/uhttpd/src/uhttpd-mimetypes.h