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

Trivial merge