Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Fri, 5 Mar 2010 22:30:03 +0000 (23:30 +0100)
committerMichael Neumann <mneumann@ntecs.de>
Fri, 5 Mar 2010 22:30:03 +0000 (23:30 +0100)

Trivial merge