Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 2 Jun 2012 17:22:04 +0000 (10:22 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 2 Jun 2012 17:22:04 +0000 (10:22 -0700)

Trivial merge