fix nhttpd
Merge branch 'next' of git://gitorious.org/neutrino-mp/max10s-neutrino-mp into next