sync
Merge branch 'master' of ssh://afs0.freedaemon.com/afs/freedaemon.com/code/OpenBSD/git/ports

Conflicts:
	emulators/fedora/base/Makefile
	emulators/fedora/base/distinfo
	emulators/fedora/base/pkg/PLIST
	infrastructure/mk/bsd.port.mk
	lang/gcc/4.2/Makefile
	net/opal/Makefile
	security/Makefile
Merge branch 'master' of ssh://afs0.freedaemon.com/afs/freedaemon.com/code/OpenBSD/git/ports
Merge branch 'master' of ssh://afs1.freedaemon.com/afs/freedaemon.com/code/OpenBSD/git/ports
Merge remote-tracking branch 'github/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'github/master'
Merge branch 'master' of ssh://0.v.freedaemon.com/afs/freedaemon.com/code/OpenBSD/git/ports
sync