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

Trivial merge