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

Trivial merge