Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Sun, 10 Oct 2010 21:00:06 +0000 (23:00 +0200)
committerMichael Neumann <mneumann@ntecs.de>
Sun, 10 Oct 2010 21:00:06 +0000 (23:00 +0200)

Trivial merge