Comment 8 for bug 1046118

As part of the new gnome-shell lockscreen, the code that handles a watchdog timer for disably X builtin screensaver was moved into gnome-settings-daemon. I have applied the git patch that fixes this.