Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authorVlad <vlad@gas.by>
Wed, 11 Aug 2010 11:26:19 +0000 (14:26 +0300)
committerVlad <vlad@gas.by>
Wed, 11 Aug 2010 11:26:19 +0000 (14:26 +0300)
commitc213fefddba7a483e7c076932aea88c096f084a4
treef473c8e4b1859a88502b53f521e965f235a2c5f2
parent520d6a0ac1a68466c2c6a7599df3ba237ab2c70e
parent392e81dc1f7b4a895b1838457380c376a80f9186
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver

Conflicts:
xscreensaver/hacks/screenhack.c
xscreensaver/hacks/screenhack.c