Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Feb 2009 05:04:04 +0000 (21:04 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Feb 2009 05:04:04 +0000 (21:04 -0800)

Trivial merge