Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorvlad <vlad@vlanout.(none)>
Tue, 10 Aug 2010 17:31:17 +0000 (20:31 +0300)
committervlad <vlad@vlanout.(none)>
Tue, 10 Aug 2010 17:31:17 +0000 (20:31 +0300)
commit89b70f1445ca357050e6a91977d4ec2f503d57c6
treea77afd9805779eb24b1d28bb9ee217a7f44cd02a
parentd03fff495196d0aa5fc4200fa050217396c69dac
parent02da4ef7e1e1f619cd33aebacec9841cd8695040
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
xscreensaver/config.sub