Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 13:15:50 +0000 (16:15 +0300)
committertanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 13:15:50 +0000 (16:15 +0300)
commit04ac9f913556d756a16f29a8464fc1cd89c73cf4
tree52c5f01903b709c890f3f84ca0c271faaa98056a
parent06ab09beadd88fed3baff1347fdc747e3bc822ec
parentc43c061176dc875876e3a91b4a7d622f473eeeee
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver