Merge branch 'check/next-cc'

Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit

src/system/settings.h

@@ -73,6 +73,7 @@ struct SNeutrinoSettings
 	int shutdown_real_rcdelay;
 	char shutdown_count[4];
 	char shutdown_min[4];
+	int sleeptimer_min;
 	char record_safety_time_before[3];
 	char record_safety_time_after[3];
 	int zapto_pre_time;
@@ -487,6 +488,12 @@ struct SNeutrinoSettings
 	int apply_settings;
 	int apply_kernel;
 
+	int flashupdate_createimage_add_uldr;
+	int flashupdate_createimage_add_u_boot;
+	int flashupdate_createimage_add_env;
+	int flashupdate_createimage_add_spare;
+	int flashupdate_createimage_add_kernel;
+
 	//BouquetHandling
 	int bouquetlist_mode;