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

Trivial merge