Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorvlad <vlad@vlanout.(none)>
Sun, 3 Oct 2010 08:50:26 +0000 (11:50 +0300)
committervlad <vlad@vlanout.(none)>
Sun, 3 Oct 2010 08:50:26 +0000 (11:50 +0300)
commit1452ed67f2043f0c7c2a3649e381614179dca452
treee07afe23ccd052c431b9eacf8fa86e70967e3121
parent159831fb6110d916fdbccd032aba6256779391a5
parenta85f458535c44c9d9eb4f7bd1e4058e341882150
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
xscreensaver/debian/changelog
xscreensaver/debian/changelog