Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorvlad <vlad@vlanout.(none)>
Tue, 10 Aug 2010 17:31:17 +0000 (20:31 +0300)
committervlad <vlad@vlanout.(none)>
Tue, 10 Aug 2010 17:31:17 +0000 (20:31 +0300)
Conflicts:
xscreensaver/config.sub


Trivial merge