Merge branch 'master' of /repository/git/dragonfly
authorPeter Avalos <pavalos@dragonflybsd.org>
Sun, 28 Feb 2010 04:04:54 +0000 (04:04 +0000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sun, 28 Feb 2010 04:04:54 +0000 (04:04 +0000)

Trivial merge