Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 3 Jan 2010 02:54:07 +0000 (18:54 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 3 Jan 2010 02:54:07 +0000 (18:54 -0800)

Trivial merge