Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3'

...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


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)

lib/libtuxtxt/tuxtxt.h

@@ -34,10 +34,6 @@
 
 #include <linux/input.h>
 
-#ifndef NEW_CST_KERNEL
-//#include <linux/videodev.h>
-#endif
-
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 
@@ -70,7 +66,8 @@ extern int tuxtxt_get_zipsize(int p, int sp);
 #endif
 
 
-#define TUXTXTCONF CONFIGDIR "/tuxtxt/tuxtxt2.conf"
+#define TUXTXTDIR CONFIGDIR "/tuxtxt"
+#define TUXTXTCONF TUXTXTDIR "/tuxtxt2.conf"
 
 /* fonts */
 #define TUXTXTTTF FONTDIR "/tuxtxt.ttf"