Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 12 Aug 2009 16:57:38 +0000 (09:57 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 12 Aug 2009 16:57:38 +0000 (09:57 -0700)

Trivial merge