Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 11:19:56 +0000 (14:19 +0300)
committertanya <tanyshk@gmail.com>
Tue, 10 Aug 2010 11:19:56 +0000 (14:19 +0300)
commitce222741e462bd39834dfd5f60d2340f99252e3f
tree8b3e0e167b38c03575098658d2acebb43735c785
parent7f330732fb54abc21193cdd08eaa424d0d6cf934
parent5b28b67a0a38bddbff1068e36c7e2ef3127a5516
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver