Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 21 Aug 2009 12:35:23 +0000 (14:35 +0200)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Fri, 21 Aug 2009 12:35:23 +0000 (14:35 +0200)

Trivial merge