Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Sat, 3 Jan 2009 13:07:22 +0000 (14:07 +0100)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Sat, 3 Jan 2009 13:07:22 +0000 (14:07 +0100)

Trivial merge