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

Trivial merge