Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 4 Aug 2012 22:06:57 +0000 (15:06 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 4 Aug 2012 22:06:57 +0000 (15:06 -0700)

Trivial merge