Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 1 Apr 2012 02:03:22 +0000 (19:03 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 1 Apr 2012 02:03:22 +0000 (19:03 -0700)

Trivial merge