Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 25 Jan 2009 07:19:42 +0000 (23:19 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 25 Jan 2009 07:19:42 +0000 (23:19 -0800)

Trivial merge