Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Apr 2012 22:48:34 +0000 (15:48 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 5 Apr 2012 22:48:34 +0000 (15:48 -0700)

Trivial merge