Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 16 Jul 2009 02:48:23 +0000 (19:48 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 16 Jul 2009 02:48:23 +0000 (19:48 -0700)

Trivial merge