Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Fri, 27 Nov 2009 11:16:50 +0000 (12:16 +0100)
committerMichael Neumann <mneumann@ntecs.de>
Fri, 27 Nov 2009 11:16:50 +0000 (12:16 +0100)

Trivial merge