Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorvlad <vlad@vlanout.(none)>
Wed, 25 Aug 2010 15:10:37 +0000 (18:10 +0300)
committervlad <vlad@vlanout.(none)>
Wed, 25 Aug 2010 15:10:37 +0000 (18:10 +0300)

Trivial merge