Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 4 Jun 2012 03:34:35 +0000 (20:34 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 4 Jun 2012 03:34:35 +0000 (20:34 -0700)

Trivial merge