Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 14 Jul 2009 10:36:06 +0000 (03:36 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 14 Jul 2009 10:36:06 +0000 (03:36 -0700)

Trivial merge