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

Trivial merge