From: tanya <tanyshk@gmail.com>
Date: Tue, 10 Aug 2010 13:14:30 +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=06ab09beadd88fed3baff1347fdc747e3bc822ec

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

06ab09beadd88fed3baff1347fdc747e3bc822ec