Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorAlex Hornung <ahornung@gmail.com>
Sat, 21 Aug 2010 14:37:50 +0000 (15:37 +0100)
committerAlex Hornung <ahornung@gmail.com>
Sat, 21 Aug 2010 14:37:50 +0000 (15:37 +0100)

Trivial merge