Merge branch 'master' of git://venus/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Fri, 27 Feb 2009 00:48:16 +0000 (19:48 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Fri, 27 Feb 2009 00:48:16 +0000 (19:48 -0500)

Trivial merge