Merge branch 'master' of ssh://swildner@crater.dragonflybsd.org/repository/git/dragonfly
authorSascha Wildner <saw@online.de>
Mon, 29 Dec 2008 18:33:51 +0000 (19:33 +0100)
committerSascha Wildner <saw@online.de>
Mon, 29 Dec 2008 18:33:51 +0000 (19:33 +0100)

Trivial merge