Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 22 Aug 2009 20:59:40 +0000 (13:59 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 22 Aug 2009 20:59:40 +0000 (13:59 -0700)

Trivial merge