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

Trivial merge