Merge of git://github.com/OpenViX/enigma2