Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorVlad <vlad@gas.by>
Tue, 17 Aug 2010 06:37:55 +0000 (09:37 +0300)
committerVlad <vlad@gas.by>
Tue, 17 Aug 2010 06:37:55 +0000 (09:37 +0300)
commit8412f351d91eed841e1f5b160c6c6b6d1a727fa4
treea9e11a8264a4babb39e8b50c80a215017ca0b733
parentac595c74eb549ec2f340be327cc03885a95d0b15
parentc2b2e37fb8ecb4bd3533ef799e3282a4dfbf5bf8
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
xscreensaver/debian/control
xscreensaver/debian/control