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

Trivial merge