Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Mon, 28 Feb 2011 16:18:02 +0000 (11:18 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Mon, 28 Feb 2011 16:18:02 +0000 (11:18 -0500)

Trivial merge