Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 10 Jan 2009 01:23:13 +0000 (17:23 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 10 Jan 2009 01:23:13 +0000 (17:23 -0800)

Trivial merge