Merge branch 'master' of git://chlamydia.fs.ei.tum.de/dragonfly
authorSimon Schubert <corecode@dragonflybsd.org>
Fri, 16 Jan 2009 21:57:33 +0000 (22:57 +0100)
committerSimon Schubert <corecode@dragonflybsd.org>
Fri, 16 Jan 2009 21:57:33 +0000 (22:57 +0100)

Trivial merge