Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 6 Jul 2012 00:48:37 +0000 (17:48 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 6 Jul 2012 00:48:37 +0000 (17:48 -0700)

Trivial merge