Merge remote-tracking branch 'check/next-cc'

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)



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

src/driver/vfd.h

@@ -90,7 +90,7 @@ class CVFD
 		unsigned int                    switch_name_time_cnt;		
 		int fd;
 		int brightness;
-		char text[256];
+		std::string text;
 
 		void count_down();