Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Sun, 3 Oct 2010 14:27:41 +0000 (16:27 +0200)
committerMichael Neumann <mneumann@ntecs.de>
Sun, 3 Oct 2010 14:27:41 +0000 (16:27 +0200)

Trivial merge