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

Trivial merge