Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 5 Oct 2010 21:03:24 +0000 (14:03 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 5 Oct 2010 21:03:24 +0000 (14:03 -0700)

Trivial merge