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

Trivial merge