Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 24 Aug 2009 15:20:02 +0000 (08:20 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 24 Aug 2009 15:20:02 +0000 (08:20 -0700)

Trivial merge