Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 13:14:30 +0000 (16:14 +0300)
committertanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 13:14:30 +0000 (16:14 +0300)
commit06ab09beadd88fed3baff1347fdc747e3bc822ec
tree59b0802296457158cd21d815bd80e0352b386cf4
parentf544aee8839b3a34c5561be2557b36cec9219027
parent1e51b852ed792801e3624e0c339c01cfd618d772
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver