Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Wed, 2 Mar 2011 23:20:24 +0000 (18:20 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Wed, 2 Mar 2011 23:20:24 +0000 (18:20 -0500)

Trivial merge