Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Jan 2014 20:01:37 +0000 (12:01 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Jan 2014 20:01:37 +0000 (12:01 -0800)

Trivial merge