Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 3 Feb 2010 18:23:36 +0000 (10:23 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 3 Feb 2010 18:23:36 +0000 (10:23 -0800)

Trivial merge