Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Mon, 31 Jan 2011 00:50:42 +0000 (19:50 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Mon, 31 Jan 2011 00:50:42 +0000 (19:50 -0500)

Trivial merge