Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Sun, 20 May 2012 18:12:44 +0000 (11:12 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Sun, 20 May 2012 18:12:44 +0000 (11:12 -0700)

Trivial merge