Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 18 Jul 2009 01:35:13 +0000 (18:35 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 18 Jul 2009 01:35:13 +0000 (18:35 -0700)

Trivial merge