Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 22 Sep 2009 04:58:43 +0000 (21:58 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 22 Sep 2009 04:58:43 +0000 (21:58 -0700)

Trivial merge