Merge branch 'master' of git://venus/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Mon, 19 Jan 2009 23:49:42 +0000 (18:49 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Mon, 19 Jan 2009 23:49:42 +0000 (18:49 -0500)

Trivial merge