Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver
authortanya <tanyshk@gmail.com>
Thu, 12 Aug 2010 13:11:16 +0000 (16:11 +0300)
committertanya <tanyshk@gmail.com>
Thu, 12 Aug 2010 13:11:16 +0000 (16:11 +0300)
commitbdc0495cbbba9d877874ac71a202ee9ab29a5585
tree8f665ef0dcc7593882a0989e7183e07646ee6444
parentb294151274f9aa12dfad061f71562ac4bc1f6366
parent0d276dee6a5236e08c4e7799e154396c0fee1361
Merge branch 'master' of https://vcs.maemo.org/git/xscreensaver