Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 27 Jul 2009 23:22:29 +0000 (16:22 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 27 Jul 2009 23:22:29 +0000 (16:22 -0700)

Trivial merge