Merge branch 'master' of git://crater.dragonflybsd.org/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Mon, 14 Mar 2011 10:34:43 +0000 (06:34 -0400)
committerJoe Talbott <josepht@dragonflybsd.org>
Mon, 14 Mar 2011 10:34:43 +0000 (06:34 -0400)

Trivial merge