Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 13 Oct 2012 03:30:02 +0000 (20:30 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 13 Oct 2012 03:30:02 +0000 (20:30 -0700)

Trivial merge