Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 6 Sep 2010 20:36:05 +0000 (13:36 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 6 Sep 2010 20:36:05 +0000 (13:36 -0700)

Trivial merge