Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Wed, 25 Nov 2009 11:57:00 +0000 (12:57 +0100)
committerMichael Neumann <mneumann@ntecs.de>
Wed, 25 Nov 2009 11:57:00 +0000 (12:57 +0100)

Trivial merge