Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 2 Oct 2009 22:58:47 +0000 (15:58 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 2 Oct 2009 22:58:47 +0000 (15:58 -0700)

Trivial merge