Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 24 Nov 2009 19:09:24 +0000 (11:09 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 24 Nov 2009 19:09:24 +0000 (11:09 -0800)

Trivial merge