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

Trivial merge