cherry-picked from seife

Conflicts:
	src/driver/audiodec/Makefile.am
	src/gui/imageinfo.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/yhttpd_core/Makefile.am
	src/zapit/src/Makefile.am