Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly into...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 9 Jan 2009 21:53:39 +0000 (13:53 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 9 Jan 2009 21:53:39 +0000 (13:53 -0800)

Trivial merge