Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 12 Apr 2010 17:15:51 +0000 (10:15 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 12 Apr 2010 17:15:51 +0000 (10:15 -0700)

Trivial merge