Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 10 Feb 2011 21:22:51 +0000 (13:22 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 10 Feb 2011 21:22:51 +0000 (13:22 -0800)

Trivial merge