Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Sat, 7 Feb 2009 19:08:05 +0000 (20:08 +0100)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Sat, 7 Feb 2009 19:08:05 +0000 (20:08 +0100)

Trivial merge