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

Trivial merge