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

Trivial merge