Merge branch 'master' of git://venus/dragonfly
authorJoe Talbott <josepht@dragonflybsd.org>
Thu, 19 Feb 2009 19:21:04 +0000 (14:21 -0500)
committerJoe Talbott <josepht@dragonflybsd.org>
Thu, 19 Feb 2009 19:21:04 +0000 (14:21 -0500)

Trivial merge