Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 20 Mar 2012 00:12:31 +0000 (17:12 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 20 Mar 2012 00:12:31 +0000 (17:12 -0700)

Trivial merge