Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorMatthias Schmidt <matthias@dragonflybsd.org>
Tue, 30 Dec 2008 22:06:48 +0000 (23:06 +0100)
committerMatthias Schmidt <matthias@dragonflybsd.org>
Tue, 30 Dec 2008 22:06:48 +0000 (23:06 +0100)

Trivial merge