Merge branch 'master' of /home/www-data/gitweb/dragonfly
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 24 Dec 2011 21:17:59 +0000 (13:17 -0800)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 24 Dec 2011 21:17:59 +0000 (13:17 -0800)

Trivial merge