From: vlad <vlad@vlanout.(none)>
Date: Tue, 10 Aug 2010 17:31:17 +0000 (+0300)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
X-Git-Url: http://vcs.maemo.org/git/?p=xscreensaver;a=commitdiff_plain;h=89b70f1445ca357050e6a91977d4ec2f503d57c6

Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
	xscreensaver/config.sub
---

89b70f1445ca357050e6a91977d4ec2f503d57c6