Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 25 Aug 2012 00:05:40 +0000 (17:05 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 25 Aug 2012 00:05:40 +0000 (17:05 -0700)

Trivial merge