Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master

diff --combined mytest.py
index ee22e20cf592188dbbb2ccd1367a391e625e509b,423031fb983d954bd8081bc98fb47030fab4a6c8..c335bf2dd8e5e566a791eb5b45d13c3ce03ed98a
mode 100644,100755..100755
--- 1/mytest.py
--- 2/mytest.py
+++ b/mytest.py
@@@ -76,7 -76,6 +76,6 @@@ from Components.PluginComponent import 
  profile("LOAD:Wizard")
  from Screens.Wizard import wizardManager
  from Screens.DefaultWizard import *
- from Screens.ImageWizard import *
  from Screens.StartWizard import *
  from Screens.TutorialWizard import *
  import Screens.Rc
@@@ -343,9 -342,6 +342,9 @@@ class PowerKey
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
  
        def powerlong(self):
 +              if Screens.Standby.inTryQuitMainloop or (self.session.current_dialog and not self.session.current_dialog.ALLOW_SUSPEND):
 +                      return
 +
                self.standbyblocked = 1
                action = config.usage.on_long_powerpress.value
                if action == "shutdown":