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

Trivial merge