Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorPeter Avalos <pavalos@dragonflybsd.org>
Sat, 2 Apr 2011 21:37:46 +0000 (11:37 -1000)
committerPeter Avalos <pavalos@dragonflybsd.org>
Sat, 2 Apr 2011 21:37:46 +0000 (11:37 -1000)

Trivial merge