Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 9 Feb 2009 06:03:56 +0000 (22:03 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 9 Feb 2009 06:03:56 +0000 (22:03 -0800)

Trivial merge