Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 27 Sep 2009 19:58:16 +0000 (12:58 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 27 Sep 2009 19:58:16 +0000 (12:58 -0700)

Trivial merge