Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorvlad <vlad@vlanout.(none)>
Mon, 9 Aug 2010 17:11:55 +0000 (20:11 +0300)
committervlad <vlad@vlanout.(none)>
Mon, 9 Aug 2010 17:11:55 +0000 (20:11 +0300)
commit2347a084285db87e257d5f0cb8ef9f2ed7ab0b78
tree3be769771a59f863f8fc3abf7b3f489120c6da74
parent24242e7a868c7cf9e9c560015a6d98af50cbc30a
parentf35a99b278dbc828697f7cb81ff8f171ebf002fb
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver