Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 20 Jan 2009 17:59:18 +0000 (09:59 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 20 Jan 2009 17:59:18 +0000 (09:59 -0800)

Trivial merge