Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Mon, 24 Aug 2009 23:51:14 +0000 (01:51 +0200)
committerMichael Neumann <mneumann@ntecs.de>
Mon, 24 Aug 2009 23:51:14 +0000 (01:51 +0200)

Trivial merge