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

Trivial merge