Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 11 Jul 2009 15:25:03 +0000 (08:25 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 11 Jul 2009 15:25:03 +0000 (08:25 -0700)

Trivial merge