Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 3 Jul 2012 17:35:56 +0000 (10:35 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 3 Jul 2012 17:35:56 +0000 (10:35 -0700)

Trivial merge