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

Trivial merge