Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 15 Mar 2014 16:34:48 +0000 (09:34 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 15 Mar 2014 16:34:48 +0000 (09:34 -0700)

Trivial merge