Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 26 Dec 2008 18:51:57 +0000 (10:51 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 26 Dec 2008 18:51:57 +0000 (10:51 -0800)

Trivial merge