Merge branch 'bug_713_fix_timerlist_sort'

diff --combined lib/python/Screens/TimerEdit.py
index 8f742b8,d540b6d..0abb42a
--- 1/lib/python/Screens/TimerEdit.py
--- 2/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@@ -89,9 -89,7 +89,9 @@@ class TimerEditList(Screen)
                                if not timersanitycheck.check():
                                        t.disable()
                                        print "Sanity check failed"
 -                                      self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, timersanitycheck.getSimulTimerList())
 +                                      simulTimerList = timersanitycheck.getSimulTimerList()
 +                                      if simulTimerList is not None:
 +                                              self.session.openWithCallback(self.finishedEdit, TimerSanityConflict, simulTimerList)
                                else:
                                        print "Sanity check passed"
                                        if timersanitycheck.doubleCheck():
@@@ -179,7 -177,7 +179,7 @@@
                def eol_compare(x, y):
                        if x[0].state != y[0].state and x[0].state == RealTimerEntry.StateEnded or y[0].state == RealTimerEntry.StateEnded:
                                return cmp(x[0].state, y[0].state)
-                       return cmp(x[0].begin, x[1].begin)
+                       return cmp(x[0].begin, y[0].begin)
  
                list = self.list
                del list[:]