Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 23 Feb 2012 16:59:32 +0000 (08:59 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 23 Feb 2012 16:59:32 +0000 (08:59 -0800)

Trivial merge