5.29
Merge branch 'master' into OSXImprovements

Conflicts:
	OSX/PrefsReader.m
	OSX/SaverListController.m
	OSX/SaverRunner.plist
	OSX/XScreenSaverConfigSheet.m
	OSX/XScreenSaverView.m
	OSX/iSaverRunner.plist
	OSX/iostextclient.m
	OSX/jwxyz.m
	hacks/fps.c
	hacks/glx/font-ximage.c
	hacks/glx/quasicrystal.c
	hacks/interference.c
	hacks/noseguy.c
	utils/grabclient.c
	utils/resources.c
	utils/yarandom.c
	xscreensaver.xcodeproj/project.pbxproj