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

Trivial merge