Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Thu, 12 Aug 2010 13:11:16 +0000 (16:11 +0300)
committertanya <tanyshk@gmail.com>
Thu, 12 Aug 2010 13:11:16 +0000 (16:11 +0300)

Trivial merge