flag was_timerwakeup
fix compiler warning

Signed-off-by: pieterg <pieterg@users.sourceforge.net>
Merge remote-tracking branch 'pli/master'

Conflicts:
	Navigation.py
openvix: build 653
[ZapHistory] move zap history screen into ChannelSelection, also fix history so when you goto a history point and then zap to a new channel the history after that point is cleared and the new zap is added to history.
remove duplicate imports.
[PermanentTimeShift] first recode for better skipping of TimeShiffed events. < > button's can now also be used to skip events when in a timeshift state. (may require more Debugging and tweaking)
openvix: build 654
[MoviePlayer] fix possible BSOD.
openvix: build 655
[MoviePlayer] cleanup fix properly the BSOD.
[ZapHistory] reset delete point if forwarding throughout history.
[EpgSelection] fix 0 button zapping in Single epg.
[PermanentTimeShift] some small fixes for exiting timeshift.
[PermanentTimeShift] some small fixes to help History Zap.
openvix: build 656
[PermanentTimeShift] only show timeshift screen if infobar is shown.
[ChoiceBox] fix some compatibility issues.
Merge branch 'master' of https://github.com/OpenViX/enigma2