Merge branch 'master' of ssh://crater.dragonflybsd.org/repository/git/dragonfly
authorJohn Marino <draco@marino.st>
Tue, 26 Apr 2011 20:47:20 +0000 (22:47 +0200)
committerJohn Marino <draco@marino.st>
Tue, 26 Apr 2011 20:47:20 +0000 (22:47 +0200)

Trivial merge