Merge branch 'master' of ssh://swildner@crater.dragonflybsd.org/repository/git/dragonfly
authorSascha Wildner <saw@online.de>
Tue, 30 Dec 2008 12:13:41 +0000 (13:13 +0100)
committerSascha Wildner <saw@online.de>
Tue, 30 Dec 2008 12:13:41 +0000 (13:13 +0100)

Trivial merge