Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 27 Dec 2008 23:14:01 +0000 (15:14 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 27 Dec 2008 23:14:01 +0000 (15:14 -0800)

Trivial merge