Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonflymaster
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 15 Mar 2010 17:50:16 +0000 (15 10:50 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 15 Mar 2010 17:50:16 +0000 (15 10:50 -0700)

Trivial merge