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

Trivial merge