Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sat, 19 May 2012 19:07:40 +0000 (12:07 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sat, 19 May 2012 19:07:40 +0000 (12:07 -0700)

Trivial merge