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

Trivial merge