Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 3 Dec 2009 20:59:32 +0000 (12:59 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 3 Dec 2009 20:59:32 +0000 (12:59 -0800)

Trivial merge