Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 30 Aug 2010 07:07:17 +0000 (00:07 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 30 Aug 2010 07:07:17 +0000 (00:07 -0700)

Trivial merge