Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 22 Mar 2010 22:28:40 +0000 (15:28 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 22 Mar 2010 22:28:40 +0000 (15:28 -0700)

Trivial merge