Merge branch 'master' of git://venus/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Fri, 20 Feb 2009 03:52:06 +0000 (22:52 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Fri, 20 Feb 2009 03:52:06 +0000 (22:52 -0500)

Trivial merge