[ChoiceBox] fix some compatibility issues.
Merge branch 'master' of git://github.com/OpenViX/enigma2

Conflicts:
	lib/python/Screens/ChoiceBox.py