Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Wed, 19 Aug 2009 17:16:41 +0000 (19:16 +0200)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Wed, 19 Aug 2009 17:16:41 +0000 (19:16 +0200)

Trivial merge