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

Trivial merge