Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 11 Sep 2009 02:16:49 +0000 (19:16 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 11 Sep 2009 02:16:49 +0000 (19:16 -0700)

Trivial merge