Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 10 Sep 2010 06:19:49 +0000 (08:19 +0200)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 10 Sep 2010 06:19:49 +0000 (08:19 +0200)

Trivial merge