Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'

...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp

src/driver/pictureviewer/Makefile.am

@@ -23,5 +23,8 @@ endif
 noinst_LIBRARIES = libneutrino_pictureviewer.a
 
 libneutrino_pictureviewer_a_SOURCES = \
-			pictureviewer.cpp png.cpp bmp.cpp \
-			jpeg.cpp gif.cpp crw.cpp
+	crw.cpp \
+	gif.cpp \
+	jpeg.cpp \
+	pictureviewer.cpp \
+	png.cpp bmp.cpp

src/driver/pictureviewer/fb_display.cpp

@@ -18,7 +18,7 @@
 #include <errno.h>
 #include "fb_display.h"
 #include "pictureviewer.h"
-#include "driver/framebuffer.h"
+#include <driver/framebuffer.h>
 
 static unsigned char *lfb = 0;
 

src/driver/pictureviewer/pictureviewer.cpp

@@ -3,7 +3,6 @@
 #include <neutrino.h>
 #include "pictureviewer.h"
 #include "pv_config.h"
-#include "driver/framebuffer.h"
 
 #include <unistd.h>
 #include <stdio.h>

src/driver/pictureviewer/pictureviewer.h

@@ -30,7 +30,7 @@
 #include <vector>
 #include <stdio.h>    /* printf       */
 #include <sys/time.h> /* gettimeofday */
-#include "driver/framebuffer.h"
+#include <driver/framebuffer.h>
 class CPictureViewer
 {
 	struct cformathandler