Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Wed, 14 Jan 2009 14:29:21 +0000 (15:29 +0100)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Wed, 14 Jan 2009 14:29:21 +0000 (15:29 +0100)

Trivial merge