Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
[xscreensaver] / welcome
2010-08-05 rootwelcome