Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 20 Aug 2009 22:31:13 +0000 (15:31 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 20 Aug 2009 22:31:13 +0000 (15:31 -0700)

Trivial merge