Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Jun 2012 01:20:17 +0000 (18:20 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 9 Jun 2012 01:20:17 +0000 (18:20 -0700)

Trivial merge