Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Thu, 25 Jun 2009 12:42:01 +0000 (14:42 +0200)
committerMichael Neumann <mneumann@ntecs.de>
Thu, 25 Jun 2009 12:42:01 +0000 (14:42 +0200)

Trivial merge