Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorMichael Neumann <mneumann@ntecs.de>
Fri, 5 Mar 2010 18:09:41 +0000 (19:09 +0100)
committerMichael Neumann <mneumann@ntecs.de>
Fri, 5 Mar 2010 18:09:41 +0000 (19:09 +0100)

Trivial merge