Merge branch 'xscreensaver-files'
authorJoachim Breitner <mail@joachim-breitner.de>
Mon, 21 Jun 2010 08:16:12 +0000 (10:16 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Mon, 21 Jun 2010 08:16:12 +0000 (10:16 +0200)

Trivial merge