Merge branch 'master' of /repository/git/dragonfly
authorPeter Avalos <pavalos@dragonflybsd.org>
Thu, 1 Oct 2009 19:32:00 +0000 (19:32 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Thu, 1 Oct 2009 19:32:00 +0000 (19:32 +0000)

Trivial merge