Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 7 Apr 2009 23:08:21 +0000 (16:08 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 7 Apr 2009 23:08:21 +0000 (16:08 -0700)

Trivial merge