Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 2 Dec 2009 22:08:08 +0000 (14:08 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 2 Dec 2009 22:08:08 +0000 (14:08 -0800)

Trivial merge