Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorAlex Hornung <ahornung@gmail.com>
Thu, 21 Jun 2012 07:34:54 +0000 (08:34 +0100)
committerAlex Hornung <ahornung@gmail.com>
Thu, 21 Jun 2012 07:34:54 +0000 (08:34 +0100)

Trivial merge