Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Fri, 20 Aug 2010 11:34:35 +0000 (14:34 +0300)
committertanya <tanyshk@gmail.com>
Fri, 20 Aug 2010 11:34:35 +0000 (14:34 +0300)
commit9b039ab43455b69fddb4c1f3200c2cea93bb2cd6
tree9b82b9f17fa179a3322f7c096e13a7597fcafb43
parent697ecccf97968a80a504672dc8a865e8b2ce24d5
parentda5debb3583059339a2d84c84737d2bc36518792
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver