Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 14 Jan 2010 17:27:39 +0000 (09:27 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 14 Jan 2010 17:27:39 +0000 (09:27 -0800)

Trivial merge