Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Sat, 25 Sep 2010 07:20:19 +0000 (09:20 +0200)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Sat, 25 Sep 2010 07:20:19 +0000 (09:20 +0200)

Trivial merge