Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 13:24:48 +0000 (16:24 +0300)
committertanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 13:24:48 +0000 (16:24 +0300)
commit02da4ef7e1e1f619cd33aebacec9841cd8695040
tree1640f8217142dae15c9ba5ffeff41b4c86e72168
parent5672c44ee191841b8b8ba7d4096ea75ad09b8f53
parent6ac1efb0620df4cdb3df3e54f45ff3fc4a81c4ae
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver