Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 12:30:40 +0000 (15:30 +0300)
committertanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 12:30:40 +0000 (15:30 +0300)

Trivial merge