Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Sat, 6 Feb 2010 01:49:57 +0000 (02:49 +0100)
committerMichael Neumann <mneumann@ntecs.de>
Sat, 6 Feb 2010 01:49:57 +0000 (02:49 +0100)

Trivial merge