Module Name:	pkgsrc
Committed By:	tron
Date:		Mon Jul 10 19:57:11 UTC 2000

Modified Files:
	pkgsrc/x11/xscreensaver/files: patch-sum
	pkgsrc/x11/xscreensaver/patches: patch-aa

Log Message:
Properly merge "patch-aa" and "patch-af".


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 pkgsrc/x11/xscreensaver/files/patch-sum
cvs rdiff -r1.5 -r1.6 pkgsrc/x11/xscreensaver/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.