Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Fri, 11 May 2012 05:19:21 +0000 (22:19 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Fri, 11 May 2012 05:19:21 +0000 (22:19 -0700)

Trivial merge