Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 1 Feb 2009 08:38:23 +0000 (00:38 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 1 Feb 2009 08:38:23 +0000 (00:38 -0800)

Trivial merge