From: vlad <vlad@vlanout.(none)>
Date: Wed, 18 Aug 2010 16:33:12 +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=1a494aef12a81a47e1885ecc947f9322a7ce4402

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

1a494aef12a81a47e1885ecc947f9322a7ce4402
diff --cc xscreensaver/config.guess
index 45bee13,951383e..951383e
mode 100755,100644..100755
--- a/xscreensaver/config.guess
+++ b/xscreensaver/config.guess
diff --cc xscreensaver/config.sub
index 87a1ee4,c060f44..c060f44
mode 100755,100644..100755
--- a/xscreensaver/config.sub
+++ b/xscreensaver/config.sub