Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 26 Jul 2009 18:35:57 +0000 (11:35 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 26 Jul 2009 18:35:57 +0000 (11:35 -0700)

Trivial merge