Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 12 Feb 2010 21:35:18 +0000 (13:35 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 12 Feb 2010 21:35:18 +0000 (13:35 -0800)

Trivial merge