Regenerate.
Merge branch '20131115-axge' of github.com:markjdb/freebsd into 20131115-axge