Merge branch 'master' of ssh://swildner@crater.dragonflybsd.org/repository/git/dragonfly
authorSascha Wildner <saw@online.de>
Sat, 25 Jul 2009 21:41:31 +0000 (23:41 +0200)
committerSascha Wildner <saw@online.de>
Sat, 25 Jul 2009 21:41:31 +0000 (23:41 +0200)

Trivial merge