Merge branch 'master' of /home/www-data/gitweb/dragonfly
authorPeter Avalos <pavalos@dragonflybsd.org>
Mon, 23 Jan 2012 03:07:23 +0000 (19:07 -0800)
committerPeter Avalos <pavalos@dragonflybsd.org>
Mon, 23 Jan 2012 03:07:23 +0000 (19:07 -0800)

Trivial merge