Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 8 Dec 2008 04:01:17 +0000 (20:01 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 8 Dec 2008 04:01:17 +0000 (20:01 -0800)

Trivial merge