Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 17 May 2012 08:53:11 +0000 (01:53 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 17 May 2012 08:53:11 +0000 (01:53 -0700)

Trivial merge