Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Fri, 20 Aug 2010 11:34:35 +0000 (14:34 +0300)
committertanya <tanyshk@gmail.com>
Fri, 20 Aug 2010 11:34:35 +0000 (14:34 +0300)

Trivial merge