Pull changes from OpenBSD as of 2013-05-24
Merge branch 'OpenBSD'

Conflicts:
	src/usr.sbin/relayctl/relayctl.c
	src/usr.sbin/relayd/config.c
	src/usr.sbin/relayd/relay.c
	src/usr.sbin/relayd/relay_http.c