Merge branch 'xscreensaver-files' of /tmp/blubb