Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 11 Oct 2010 17:00:23 +0000 (10:00 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 11 Oct 2010 17:00:23 +0000 (10:00 -0700)

Trivial merge