Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 23 Aug 2009 16:28:55 +0000 (09:28 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 23 Aug 2009 16:28:55 +0000 (09:28 -0700)

Trivial merge