Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Thu, 12 Aug 2010 10:39:13 +0000 (13:39 +0300)
committertanya <tanyshk@gmail.com>
Thu, 12 Aug 2010 10:39:13 +0000 (13:39 +0300)
commitb294151274f9aa12dfad061f71562ac4bc1f6366
tree6cf4d638defbdcf2ea159aeb7df8cb4f75042a25
parentd670da8616edd475de9f5171a46994c80af32e11
parent48cd6df3862a32a8683e7dae2d29c51e6f4954d8
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver