sync from head
authorSimon J. Gerraty <sjg@FreeBSD.org>
Fri, 12 Apr 2013 20:48:55 +0000 (20:48 +0000)
committerSimon J. Gerraty <sjg@FreeBSD.org>
Fri, 12 Apr 2013 20:48:55 +0000 (20:48 +0000)

Trivial merge