Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 9 Jan 2009 11:38:43 +0000 (12:38 +0100)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 9 Jan 2009 11:38:43 +0000 (12:38 +0100)

Trivial merge