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

Trivial merge