Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorAlex Hornung <ahornung@gmail.com>
Thu, 28 Jun 2012 10:53:08 +0000 (11:53 +0100)
committerAlex Hornung <ahornung@gmail.com>
Thu, 28 Jun 2012 10:53:08 +0000 (11:53 +0100)

Trivial merge