Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 12 Sep 2009 17:44:21 +0000 (10:44 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 12 Sep 2009 17:44:21 +0000 (10:44 -0700)

Trivial merge