Merge OpenBSD -current (2013-03-18 12:36 UTC).
Merge branch 'openbsd-current'