Merge branch 'master' of ssh://alexh@crater.dragonflybsd.org/repository/git/dragonfly
authorAlex Hornung <ahornung@gmail.com>
Tue, 4 Aug 2009 21:50:27 +0000 (22:50 +0100)
committerAlex Hornung <ahornung@gmail.com>
Tue, 4 Aug 2009 21:50:27 +0000 (22:50 +0100)

Trivial merge