Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Tue, 1 Feb 2011 19:22:03 +0000 (14:22 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Tue, 1 Feb 2011 19:22:03 +0000 (14:22 -0500)

Trivial merge