Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 14 Apr 2010 15:30:15 +0000 (08:30 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 14 Apr 2010 15:30:15 +0000 (08:30 -0700)

Trivial merge