Merge branch 'master' of ssh://swildner@crater.dragonflybsd.org/repository/git/dragonfly
authorSascha Wildner <saw@online.de>
Fri, 27 Nov 2009 12:17:11 +0000 (13:17 +0100)
committerSascha Wildner <saw@online.de>
Fri, 27 Nov 2009 12:17:11 +0000 (13:17 +0100)

Trivial merge