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

Trivial merge