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

Trivial merge