Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Fri, 15 Apr 2011 01:28:28 +0000 (21:28 -0400)
committerJoe Talbott <josepht@dragonflybsd.org>
Fri, 15 Apr 2011 01:28:28 +0000 (21:28 -0400)

Trivial merge