Merge branch 'master' of git://venus/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Sat, 10 Jan 2009 19:03:45 +0000 (14:03 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Sat, 10 Jan 2009 19:03:45 +0000 (14:03 -0500)

Trivial merge