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

Trivial merge