Merge branch 'master' of git://git.dragonflybsd.org/dragonfly
authorChris Turner <c.turner@199technologies.com>
Sat, 10 Mar 2012 11:43:41 +0000 (11:43 +0000)
committerChris Turner <c.turner@199technologies.com>
Sat, 10 Mar 2012 11:43:41 +0000 (11:43 +0000)

Trivial merge