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

Trivial merge