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

Trivial merge