Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 28 Aug 2009 05:47:13 +0000 (22:47 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 28 Aug 2009 05:47:13 +0000 (22:47 -0700)

Trivial merge