Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 11 Jul 2012 22:28:28 +0000 (15:28 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 11 Jul 2012 22:28:28 +0000 (15:28 -0700)

Trivial merge