Merge branch 'master' of /home/www-data/gitweb/dragonfly
authorPeter Avalos <pavalos@dragonflybsd.org>
Wed, 29 Sep 2010 20:08:37 +0000 (10:08 -1000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Wed, 29 Sep 2010 20:08:37 +0000 (10:08 -1000)

Trivial merge