Merge branches 'hammer2' and 'master' of ssh://crater.dragonflybsd.org/repository...
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 7 Jun 2012 23:10:42 +0000 (16:10 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 7 Jun 2012 23:10:42 +0000 (16:10 -0700)

Trivial merge