Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Mon, 2 Apr 2012 21:25:53 +0000 (14:25 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Mon, 2 Apr 2012 21:25:53 +0000 (14:25 -0700)

Trivial merge