d561392572
build, and freebsd-update chokes on it. Somehow it did manage to be merged, despite my best efforts not to. Approved by: delphij (mentor)