Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Fri, 4 Mar 2011 23:09:22 +0000 (18:09 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Fri, 4 Mar 2011 23:09:22 +0000 (18:09 -0500)

Trivial merge