From http://www.jwz.org/xscreensaver/xscreensaver-5.22.tar.gz

-rw-r--r-- 1 zblaxell zblaxell 7411666 Jul 16 05:35 xscreensaver-5.22.tar.gz
b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec  xscreensaver-5.22.tar.gz
Merge remote-tracking branch 'Zygo/master'

Conflicts:
	utils/colors.c
	utils/minixpm.c
	xscreensaver.xcodeproj/project.pbxproj