Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorvlad <vlad@vlanout.(none)>
Mon, 9 Aug 2010 17:11:55 +0000 (20:11 +0300)
committervlad <vlad@vlanout.(none)>
Mon, 9 Aug 2010 17:11:55 +0000 (20:11 +0300)

Trivial merge