Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Aug 2012 17:39:59 +0000 (10:39 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 10 Aug 2012 17:39:59 +0000 (10:39 -0700)

Trivial merge