Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorVlad <vlad@gas.by>
Thu, 19 Aug 2010 05:01:56 +0000 (08:01 +0300)
committerVlad <vlad@gas.by>
Thu, 19 Aug 2010 05:01:56 +0000 (08:01 +0300)

Trivial merge