Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 20 Sep 2009 17:30:34 +0000 (10:30 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 20 Sep 2009 17:30:34 +0000 (10:30 -0700)

Trivial merge