Merge branch 'xscreensaver-files' of /tmp/blubb
authorJoachim Breitner <mail@joachim-breitner.de>
Tue, 8 Dec 2009 00:04:28 +0000 (01:04 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Tue, 8 Dec 2009 00:04:28 +0000 (01:04 +0100)

Trivial merge