Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorJan Lentfer <Jan.Lentfer@web.de>
Fri, 20 May 2011 12:21:33 +0000 (14:21 +0200)
committerJan Lentfer <Jan.Lentfer@web.de>
Fri, 20 May 2011 12:21:33 +0000 (14:21 +0200)

Trivial merge