Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 3 Oct 2009 00:16:52 +0000 (17:16 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 3 Oct 2009 00:16:52 +0000 (17:16 -0700)

Trivial merge