Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 22 Apr 2009 21:51:29 +0000 (14:51 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 22 Apr 2009 21:51:29 +0000 (14:51 -0700)

Trivial merge