Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 9 Aug 2009 18:15:35 +0000 (11:15 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 9 Aug 2009 18:15:35 +0000 (11:15 -0700)

Trivial merge