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

Trivial merge